From 03e562a15dee3d3530b890a673b57ef9c79ccbd0 Mon Sep 17 00:00:00 2001
From: "Bob (GrudininYK)" <GrudininYK@mpei.ru>
Date: Sun, 14 Apr 2024 22:43:43 +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=B0=D0=BA=D1=81=D0=B8=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=B8=20=D0=BC=D0=B8=D0=BD=D0=B8=D0=BC=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=87=D0=B8=D1=81=D0=BB?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/main.cpp b/main.cpp
index 7fe6952..ae79385 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,18 +11,17 @@ int main()
         << "A - B = " << a - b << '\n'
         << "A * B = " << a * b << '\n'
         << "A / B = " << a / b << '\n';
-<<<<<<< HEAD
         if ( a > b ) {
             cout << "maximum: " << a;
         }
         else {
             cout << "maximum: " << b;
-=======
+        }
         if ( a < b ) {
             cout << "minimum: " << a;
         }
         else {
             cout << "minimum: " << b;
->>>>>>> ec0eaf5 (code: вывод минимального числа)
         }
+        return 0;
 }