From d320b8b0df28b1a6b7d133b3184bd2067ab7bec7 Mon Sep 17 00:00:00 2001 From: "Alice (ZaharSA)" Date: Mon, 29 May 2023 14:49:39 +0300 Subject: [PATCH] correction --- main.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/main.cpp b/main.cpp index 2776116..c9bbaa2 100644 --- a/main.cpp +++ b/main.cpp @@ -6,15 +6,10 @@ int main() { cout << "Enter A and B: "; int a, b; -cin >> a >> b; -cout << "A + B .=.. " << a + b << '\n' +cout << "A + B = " << a + b << '\n' << "A - B = " << a - b << '\n' -<<<<<<< HEAD - << "A * Bb =" << a * b;'\n' -======= - << "A * B =.." << a * b <<'\n' - << "Aà % Bb =..." << a % b;'\n' - << "Bb * b =.."<< a **b; + << "A * B = " << a * b << '\n' + << "A / B = " << a / b << '\n'; >>>>>>> 917d7839b44e13940165081fa67d3e197689bb4d return 0;