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

main.cpp

@@ -16,4 +16,9 @@ int main()
         cout << "min = " << a;
     }
     else cout << "min = " << b;
+    if (a > b)
+    {
+        cout << "max = " << a;
+    }
+    else cout << "max = " << b;
 }