From 29eb4683cdbedef847afe061423a0a2718a778e2 Mon Sep 17 00:00:00 2001
From: "Bob(LiTH)" <LiTek@mpei.ru>
Date: Mon, 27 Mar 2023 00:48:31 +0300
Subject: [PATCH] code: added min

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

diff --git a/main.cpp b/main.cpp
index 1eae93d..a473a72 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,17 +11,14 @@ int main()
     << "A - B = " << a - b << '\n'
     << "A * B = " << a * b << '\n'
     << "A / B = " << a / b << '\n';
-<<<<<<< HEAD
     if (a < b)
         cout << "max = " << b;
     else
         cout << "max = " << a;
 
-=======
     if (a > b)
         cout << "min = " << b;
     else
         cout << "min = " << a;
->>>>>>> 9fbafa2 (code: added min)
     return 0;
 }