From ef302f8e1aba504f9be67f3ea2559c0fbd8f76ba Mon Sep 17 00:00:00 2001
From: "Bob (TabolinIA)" <TabolinIA@mpei.ru>
Date: Wed, 10 Apr 2024 10:49:20 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BC?=
 =?UTF-8?q?=D0=B8=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 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/main.cpp b/main.cpp
index 344aa0a..c9913ab 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,13 +7,23 @@ 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: вывод минимума)
 }