From 5e0e7d5259ee5bcc4180a06b9579c311be05db9b 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 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/main.cpp b/main.cpp
index 144a11f..1eae93d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,10 +11,17 @@ 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;
 }