code: добавлен вывод минимума

main.cpp

@@ -9,16 +9,16 @@ int main()
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
         << "A - B = " << a - b << '\n'
-<<<<<<< HEAD
-        << "A * b == " << a * b << '\n';
-
-
-=======
+        << "A * b == " << a * b << '\n'
         << "A * B = " << a * b << '\n';
     if(a>b){
         cout << "MAX: " << a << '\n';
     }else{
     cout << "MAX: " << b << '\n;';
     }
->>>>>>> 64d26ed (code: добавлен вывод максимума)
+    if(a>b){
+        cout << "MIN: " << b << '\n';
+    }else{
+        cout << "MIN: " << a << '\n';
+    }
 }