From c2b260d996201ae7f006cdc15a70f4fe96c2a807 Mon Sep 17 00:00:00 2001
From: "Bob (TabolinIA)" <TabolinIA@mpei.ru>
Date: Wed, 10 Apr 2024 11:38:34 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D1=80=D0=B0=D0=B7=D1=80=D0=B5=D1=88?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=84=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BA=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/main.cpp b/main.cpp
index c9913ab..59739b0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,23 +7,18 @@ int main()
     cout << "Enter A and B: ";
     int a, b;
     cin >> a >> b;
-<<<<<<< HEAD
     int max = a;
     if (b > a){
         max = b;
-=======
+    }
     int min = a;
     if (b < a){
         min = b;
->>>>>>> 6bc83aa (code: вывод минимума)
     }
     cout << "A + B = " << a + b << '/n'
     << "A - B = " << a - b << '/n'
     << "A * B = " << a * b << '/n'
     << "A / B = " << a / b << '/n'
-<<<<<<< HEAD
-    << "max(A, B) = " << max << '/n';
-=======
-    << "max(A, B) = " << min << '/n';
->>>>>>> 6bc83aa (code: вывод минимума)
+    << "max(A, B) = " << max << '/n'
+    << "min(A, B) = " << min << '/n';
 }