From 341661fab3cf4af3fc1a3a91c20295971b0ffb78 Mon Sep 17 00:00:00 2001
From: "Alice (KalenskovaDA)" <KalenskovaDA@mpei.ru>
Date: Mon, 26 May 2025 04:24:55 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=BC=D0=B0=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 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/main.cpp b/main.cpp
index 95f075d..0303cca 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,12 +9,8 @@ cout << "Enter A and B: ";
 int a, b;
 cin >> a >> b;
 cout << "A + B = " << a + b << '\n'
-<<<<<<< HEAD
+
 << "A - B = " << a - b << '\n'
 << "A * B = " << a * b << '\n'
-<< "A / B = " << a / b << '\n';
-=======
-<< "A - B = " << a - b << '\n';
-<< "A * B = " << a * b << '\n';
->>>>>>> 49938fe428eb2375b173e4fbc39789fee4673c98
-}
+<< "A / B = " << a / b << '\n'
+<<"max = "<<(a > b) ? a : b<<'\n';