From f79a03045f0d40533cbeae0c3c2340b911c418d6 Mon Sep 17 00:00:00 2001
From: "bob (smirnovF)" <mr.fedush@gmail.com>
Date: Wed, 10 Apr 2024 11:55:22 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/main.cpp b/main.cpp
index 9a4302e..ef3348c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,19 +7,16 @@ int main()
     cout << "Enter A and B: ";
     int a, b;
     cin >> a >> b;
-<<<<<<< HEAD
     int maxx;
     if (a>b){
         maxx=a;
     }else{
         maxx=b;
-=======
     int mini;
     if (a<b){
         mini=a;
     }else{
         mini=b;
->>>>>>> 4db7c31 (code:add min)
     }
 cout<< "A + B = " << a + b << '\n'
     << "A - B = " << a - b << '\n'