From d19ff575719766b768cf63cf2ca14fcd2c27961a Mon Sep 17 00:00:00 2001
From: "Bob (NalitkinPK)" <NalitkinPK@mpei.ru>
Date: Sat, 9 Nov 2024 16:15:36 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=B8?=
=?UTF-8?q?=20=D0=BC=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 | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/main.cpp b/main.cpp
index 8b558e7..3219ed4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -12,8 +12,13 @@ int main()
<< "A - B = " << a - b << '\n'
<< "A * B = " << a * b << '\n'
<< "A / B = " << a / b << '\n';
+<<<<<<< HEAD
cout << max(a, b);
cout << min(a, b);
+=======
+ cout << max(a, b);
+ cout << min(a, b);
+>>>>>>> df5cc75 (code: Добавление печати минимума)
}