From dbdcab758bea41ef32befebdef83c72ce5a4e93b Mon Sep 17 00:00:00 2001
From: "Alice (KlimenchenkoIA)" <KlimenchenkoIA@mpei.ru>
Date: Mon, 7 Apr 2025 14:45:53 +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=B0?=
 =?UTF-8?q?=D0=BA=D1=81=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 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/main.cpp b/main.cpp
index ff1c982..4e16e52 100644
--- a/main.cpp
+++ b/main.cpp
@@ -10,8 +10,6 @@ int main()
     cout << "A + B = " << a + b << '\n';
     cout<< "A - B = " << a - b << '\n';
     cout<< "A * B = " << a * b << '\n';
-<<<<<<< HEAD
     cout<< "A / B = " << a / b << '\n';
-=======
->>>>>>> 391e34f1bffbfd05c1ff4f4fd26786799f23a3bd
+    cout<< "max(A, B) = " << max(a, b) << '\n';
 }