From 684241a8d39e23f538e43a3cafb8ec9621e9b419 Mon Sep 17 00:00:00 2001
From: "Alice (IvanovAA)" <IvanovArtAl@mpei.ru>
Date: Fri, 7 Nov 2025 09:50:00 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?max?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/main.cpp b/main.cpp
index af5f41a..4a92b61 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,19 +1,14 @@
 #include <iostream>
-
 using namespace std;
 
-int main()
-{
+int main() {
     cout << "Enter A and B: ";
     int a, b;
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
-    << "A - B = " << a - b << '\n'
-<<<<<<< HEAD
-    << "A * B = " << a * b << '\n'
-    << "A / B = " << a / b << '\n';
-=======
-    << "A * B = " << a * b << '\n';
->>>>>>> 39405101af664ce18327d0a764a1e4514b628162
-
+        << "A - B = " << a - b << '\n';
+    cout << "A * B = " << a * b << '\n';
+    cout << "A / B = " << a / b << '\n';
+    cout << "MAX = " << (a > b ? a : b) << '\n';
+    return 0;
 }