From 4dda8b705801f686040f28a9c48d4970f0536b52 Mon Sep 17 00:00:00 2001
From: "Bob (SiniavskiiSU)" <SiniavskySY@mpei.ru>
Date: Mon, 13 Mar 2023 16:25:03 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=9E=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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