From 0bb8d23db97dff01a86b932e3db56e59c888b536 Mon Sep 17 00:00:00 2001
From: "Alice (KobzevAV)" <KobzevAlV@mpei.ru>
Date: Mon, 27 Mar 2023 10:35:43 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=BA=20=D0=BA=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/main.cpp b/main.cpp
index e8b69be..8f0acd9 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, MaxNumber, MinNumber;
-=======
     double a, b, MaxNumber, MinNumber;
->>>>>>> double
     cin >> a >> b;
     if (a > b){
         MaxNumber = a;