From 30c68a03c9220e76d2c78fa53e2da4549dbac42d Mon Sep 17 00:00:00 2001
From: "Alice (GalkinMK)" <GalkinMK@mpei.ru>
Date: Mon, 14 Apr 2025 14:32:08 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BF=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20double?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/main.cpp b/main.cpp
index 55db762..3a22222 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,20 +5,15 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
-    int a, b;
+    double 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';
     if(a>b){
         cout << "MAX: " << a << '\n';
     }else{
     cout << "MAX: " << b << '\n;';
     }
->>>>>>> 64d26ed (code: добавлен вывод максимума)
 }