From 74bfe99c850331297a897957b4232734ec226746 Mon Sep 17 00:00:00 2001
From: "Alice (TiutinMO)" <TiutinMO@mpei.ru>
Date: Mon, 5 May 2025 02:08:53 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B8=D0=BF=D0=B0=20double=20=D1=81?=
 =?UTF-8?q?=D0=BE=20=D1=81=D0=BB=D0=B8=D1=8F=D0=BD=D0=B8=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/main.cpp b/main.cpp
index 351ab18..e20101c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,10 +11,7 @@ int main()
          << "A - B = " << a - b << '\n'
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n'
-<<<<<<< HEAD
-         << max(a, b);
-=======
+         << max(a, b)
          << min(a, b);
->>>>>>> eac7fe3 (code: вывод минимума)
     return 0;
 }