From f0956fcb262dce139b4da3625d5ce0c6d771fae2 Mon Sep 17 00:00:00 2001
From: "Bob (SiniavskiiSU)" <SiniavskySY@mpei.ru>
Date: Mon, 13 Mar 2023 16:08:16 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=92=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

---
 project.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/project.cpp b/project.cpp
index 8913bcc..e78b088 100644
--- a/project.cpp
+++ b/project.cpp
@@ -12,10 +12,19 @@ int main()
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n';
     if (a > b) {
+<<<<<<< HEAD
         cout << a;
     }
     else {
         cout << b;
     }
+=======
+        cout << b;
+    }
+    else {
+        cout << a;
+    }
+
+>>>>>>> 3a9e836 (code: Вывод минимума)
 
 }