From 7fcedad9ac0ea19906d56f2a80cd6fb6f73c284a Mon Sep 17 00:00:00 2001
From: "Bob (KoldinaAE)" <arinakoldina@mail.ru>
Date: Sun, 23 Mar 2025 21:03:58 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BC?=
 =?UTF-8?q?=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 5173300..2f712df 100644
--- a/main.cpp
+++ b/main.cpp
@@ -10,7 +10,11 @@ int main()
     cout << "A + B = " << a + b << '\n'
          << "A - B = " << a - b << '\n'
          << "A * B = " << a * b << '\n'
+<<<<<<< HEAD
          << "A / B = " << a / b << '\n'
          << "Min: " << min(a, b) << '\n'
          << "Max: " << max(a, b) << '\n';
+=======
+         << "A / B = " << a / b << '\n';
+>>>>>>> parent of 8245a33 (code: вывод минимума)
 }