From 1be44e2db7f12bfb4a17e5c407981e52670ed7ae Mon Sep 17 00:00:00 2001
From: NalitkinPK <nalitkinpk@mpei.ru>
Date: Sat, 9 Nov 2024 13:39:23 +0000
Subject: [PATCH] revert d19ff575719766b768cf63cf2ca14fcd2c27961a
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

revert code: Добавление печати минимума
---
 main.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/main.cpp b/main.cpp
index 3219ed4..8b558e7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -12,13 +12,8 @@ int main()
          << "A - B = " << a - b << '\n'
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n';
-<<<<<<< HEAD
 
     cout << max(a, b);
     cout << min(a, b);
 
-=======
-    cout << max(a, b);
-    cout << min(a, b);
->>>>>>> df5cc75 (code: Добавление печати минимума)
 }