code: код до конфликта

main.cpp

@@ -9,8 +9,10 @@ int a, b;
 cin >> a >> b;
 cout << "A + B = " << a + b << '\n'
      << "A - B = " << a - b << '\n'
+     << "A * B = " << a * b << '\n'
      << "A / B = " << a / b << '\n';
 
 
+
     return 0;
 }