code: разрешение конфликта

main.cpp

@@ -7,23 +7,18 @@ int main()
     cout << "Enter A and B: ";
     int a, b;
     cin >> a >> b;
-<<<<<<< HEAD
     int max = a;
     if (b > a){
         max = b;
-=======
+    }
     int min = a;
     if (b < a){
         min = b;
->>>>>>> 6bc83aa (code: вывод минимума)
     }
     cout << "A + B = " << a + b << '/n'
     << "A - B = " << a - b << '/n'
     << "A * B = " << a * b << '/n'
     << "A / B = " << a / b << '/n'
-<<<<<<< HEAD
-    << "max(A, B) = " << max << '/n';
-=======
-    << "max(A, B) = " << min << '/n';
->>>>>>> 6bc83aa (code: вывод минимума)
+    << "max(A, B) = " << max << '/n'
+    << "min(A, B) = " << min << '/n';
 }