Resolved merge conflicts

code: вывод минимума
--- a/main.cpp
+++ b/main.cpp
@ -9,8 +9,9 @@ int main()
    cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
    << "A - B = " << a - b << '\n'
-    << "A * B = " << a * b << '\n'
-     << "A / B = " << a / b << '\n'
+     << "A * B = " << a * b << '\n'
+      << "A / B = " << a / b << '\n'
 << "Max(A, B) = " << max(a, b) << '\n'
+  << "Min(A, B) = " << min(a, b) << '\n';

 }
Автор	SHA1	Сообщение	Дата
Bob (StepanovaKY)	1cd6961419	Resolved merge conflicts	3 недель назад
Bob (StepanovaKY)	d4d0e3a3b6	code: вывод минимума	3 недель назад