From 4e3fed332762a5178972ebbc760ade73fd63d8a4 Mon Sep 17 00:00:00 2001
From: "Bob (TiutinMO)" <TiutinMO@mpei.ru>
Date: Mon, 28 Apr 2025 14:47:47 +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 d448948..54ae710 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,6 +11,10 @@ int main()
         << "A - B = " << a - b << '\n'
         << "A * B = " << a * b << '\n'
         << "A / B = " << a / b << '\n'
+<<<<<<< HEAD
         << max(a, b);
+=======
+        << min(a, b);
+>>>>>>> f4b6ef4 (code: вывод минимума)
     return 0;
 }