"code: исправление конфликта"

main.cpp

@@ -12,10 +12,16 @@ int main()
         max = a;
     }
     else max = b;
+    int min;
+    if (a<b){
+        min = a;
+    }
+    else min = b;
     cout << "A + B = " << a+b << '\n'
          << "A - B = " << a-b << '\n'
          << "A * B = " << a*b << '\n'
          << "A / B = " << a/b << '\n'
-         << "Max = " << max << '\n';
+         << "Max = " << max << '\n'
+         << "Min = " << min << '\n';
     return 0;
 }