main.cpp

@@ -12,13 +12,5 @@ int main()
          << "A - B = " << a - b << '\n'
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n';
-<<<<<<< HEAD
-
-    cout << max(a, b);
-    cout << min(a, b);
-
-=======
     cout << max(a, b);
-    cout << min(a, b);
->>>>>>> df5cc75 (code: Добавление печати минимума)
 }