From 9d3e654c7676ce05ea41428e97e313ddf732b075 Mon Sep 17 00:00:00 2001
From: rogozinay <rogozinay@mpei.ru>
Date: Wed, 22 Nov 2023 20:48:26 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BC=D0=B8?=
 =?UTF-8?q?=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, 3 insertions(+), 7 deletions(-)

diff --git a/main.cpp b/main.cpp
index 5d0cbb6..bee5303 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,13 +11,9 @@ int main()
     cout << "A + B = " << a + b << '\n'
         << "A - B = " << a - b << '\n'
         << "A * B = " << a * b << '\n'
-        << "A / B = " << a / b << '\n';
-
-<<<<<<< HEAD
-        min(a, b);
-=======
-    max(a, b);
->>>>>>> 5d15d1c (code: добавление максимума из чисел)
+        << "A / B = " << a / b << '\n'
+        << min(a, b)
+        << max(a, b);
 
     return 0;
 }