From 350e775e6bf830d4c2498a0d70a3c3faa9c79448 Mon Sep 17 00:00:00 2001
From: "bob (smirnovF)" <mr.fedush@gmail.com>
Date: Wed, 27 Mar 2024 17:10:44 +0300
Subject: [PATCH] code:add min

---
 main.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/main.cpp b/main.cpp
index 34d74cf..9a4302e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,11 +7,19 @@ 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'