From e21f90eb7e17670d89804fb073480b88c6029e98 Mon Sep 17 00:00:00 2001
From: "Bob (TimoshenkoAA)" <timoshenkoaa@mpei.ru>
Date: Sun, 31 Mar 2024 17:10:27 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D1=8C=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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.cpp b/main.cpp
index f8c918a..0716dd5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,11 +9,15 @@ int main()
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
          << "A - B = " << a - b << '\n'
+<<<<<<< HEAD
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n';
     if (a>b){
         cout << a;}
     else{
         cout << b;}
+=======
+         << "A * B = " << a * b << '\n';
+>>>>>>> 58348bb (code: Добавлена печать минимума)
 }