From 6172c058a6ae19d7b4843974f18544663b94dea4 Mon Sep 17 00:00:00 2001
From: "Bob (StepanovaKY)" <StepanovaKY@mpei.ru>
Date: Sun, 6 Apr 2025 21:49:47 +0300
Subject: [PATCH] Resolved conflicts and updated main.cpp
---
main.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/main.cpp b/main.cpp
index 9797878..c0df579 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,14 +4,14 @@ using namespace std;
int main()
{
- cout << "Enter A and B: ";
+ cout << "Enter A and B: ";
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'
-<< "Max(A, B) = " << max(a, b) << '\n'
- << "Min(A, B) = " << min(a, b) << '\n';
+ cout << "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';
}