code: добавлен вывод максимума

main.cpp

@@ -10,8 +10,6 @@ int main()
     cout << "A + B = " << a + b << '\n';
     cout<< "A - B = " << a - b << '\n';
     cout<< "A * B = " << a * b << '\n';
-<<<<<<< HEAD
     cout<< "A / B = " << a / b << '\n';
-=======
+    cout<< "max(A, B) = " << max(a, b) << '\n';
->>>>>>> 391e34f1bffbfd05c1ff4f4fd26786799f23a3bd
 }