From df54f6e0fdce16d893fcdb5b81851a187a6c40f0 Mon Sep 17 00:00:00 2001
From: "Alice (KnyazevSK)" <KnyazevSK@mpei.ru>
Date: Mon, 27 Mar 2023 16:51:53 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=BE=D1=87=D0=BD=D0=BE=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/main.cpp b/main.cpp
index 2229a2e..f787b42 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,11 +5,7 @@ using namespace std;
 int main()
 {
 cout << "Enter A and B: ";
-<<<<<<< HEAD
-int  a, b;
-=======
 double a, b;
->>>>>>> double
 cin >> a >> b;
 cout << "A + B = " << a + b << '\n'
      << "A - B = " << a - b << '\n'
@@ -20,13 +16,9 @@ cout << "A + B = " << a + b << '\n'
     else
         cout << b;
     if (a<b)
-<<<<<<< HEAD
+
         cout<<a;
     else cout<<b;
-=======
-        cout<< a;
-    else
-        cout<< b;
->>>>>>> double
+
 
 }