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

: добавил максимум

main.cpp

@@ -5,17 +5,32 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
-    int a, b, mn;
+    int a, b, mn, mx;
     cin >> a >> b;
     if (a>b){
         mn=b;
     }
     else{
         mn=a;
+    if (a>b){
+    double a, b, mx, mn;
+    cin >> a >> b;
+    if (a>b){
+        mx=a;
+    }
+    else{
+        mx=b;
+    }
+    if (a>b){
+	mn=b;
+    }
+    else{
+	mn=a;
     }
     cout << "A + B = " << a + b << '\n'
     << "A - B = " << a - b << '\n'
     << "A * B = " << a * b << '\n'
     << "A / B = " << a / b << '\n'
-    << "Min(A,B)= " << mn;
+    << "Min(A,B)= " << mn << '\n'
+    << "Max(A,B)= " << mx;
 }