merge commit

main.cpp

@@ -11,6 +11,12 @@ int main()
     cout << "A * B = " << a * b << '\n';
     cout << "A / B = " << a / b << '\n';
     cout << "MAX = " << (a > b ? a : b) << '\n';
+<<<<<<< HEAD
     cout << "MIN = " << (a < b ? a : b) << '\n';
+=======
+
+    cout << "MIN = " << (a < b ? a : b) << '\n';
+
+>>>>>>> 4faa83512c724169d00e6679985e1927764bb2a6
     return 0;
 }