main.cpp

@@ -5,13 +5,16 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
-    double a, b;
+    int a, b;
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
          << "A - B = " << a - b << '\n'
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n'
-         << max(a, b)
+<<<<<<< HEAD
+         << max(a, b);
+=======
          << min(a, b);
+>>>>>>> eac7fe3 (code: вывод минимума)
     return 0;
 }