From 34b578e257a55cb4eca1000db6e899a5ebd3c5fa Mon Sep 17 00:00:00 2001
From: "Bob (GalkinMK)" <GalkinMK@mpei.com>
Date: Mon, 7 Apr 2025 15:13:34 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BC=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BC=D1=83=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main.cpp b/main.cpp
index 55db762..5b6247f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,16 +9,16 @@ int main()
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
         << "A - B = " << a - b << '\n'
-<<<<<<< HEAD
-        << "A * b == " << a * b << '\n';
-
-
-=======
+        << "A * b == " << a * b << '\n'
         << "A * B = " << a * b << '\n';
     if(a>b){
         cout << "MAX: " << a << '\n';
     }else{
     cout << "MAX: " << b << '\n;';
     }
->>>>>>> 64d26ed (code: добавлен вывод максимума)
+    if(a>b){
+        cout << "MIN: " << b << '\n';
+    }else{
+        cout << "MIN: " << a << '\n';
+    }
 }