From d4d0e3a3b6fee4c2fc50e1e113db2a8e72c1eca8 Mon Sep 17 00:00:00 2001 From: "Bob (StepanovaKY)" Date: Sun, 6 Apr 2025 21:05:00 +0300 Subject: [PATCH 1/3] =?UTF-8?q?code:=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D0=B8=D0=BC=D1=83=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.cpp b/main.cpp index 68defed..e14665c 100644 --- a/main.cpp +++ b/main.cpp @@ -9,5 +9,7 @@ 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' } From 1f70af0ee70e3ab3761e6625a85d59efc89ba859 Mon Sep 17 00:00:00 2001 From: "Bob (StepanovaKY)" Date: Sun, 6 Apr 2025 21:15:01 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 main diff --git a/main b/main new file mode 100644 index 0000000..e69de29 From 6172c058a6ae19d7b4843974f18544663b94dea4 Mon Sep 17 00:00:00 2001 From: "Bob (StepanovaKY)" Date: Sun, 6 Apr 2025 21:49:47 +0300 Subject: [PATCH 3/3] 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'; }