From 4ae5ab0760e4f589d2881cf525f4ef0cf67c4781 Mon Sep 17 00:00:00 2001
From: "Bob (PodolskyNK)" <PodolskyNK@mpei.ru>
Date: Mon, 15 Apr 2024 12:09:07 +0300
Subject: [PATCH] =?UTF-8?q?code:=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=20=D0=B8=D0=B7?=
 =?UTF-8?q?=20a=20=D0=B8=20b?=
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 21bbd8c..d5cc303 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,7 +18,11 @@ int main()
 
          << "A / B = " << a / b << '\n'
 
+<<<<<<< HEAD
          << "max(a, b) = " << max(a, b) << '\n';
+=======
+         << "min(a, b) = " << min(a, b) << '\n';
+>>>>>>> 3e3f5b3 (code: печать минимума из a и b)
 
 
     return 0;