From a557bfeb59472434c4a3e9578ce0bd48443eeb6b Mon Sep 17 00:00:00 2001
From: rogozinay <rogozinay@mpei.ru>
Date: Tue, 21 Nov 2023 22:47:10 +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=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=BA=D1=81=D0=B8=D0=BC?=
 =?UTF-8?q?=D1=83=D0=BC=D0=B0=20=D0=B8=D0=B7=20=D1=87=D0=B8=D1=81=D0=B5?=
 =?UTF-8?q?=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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