From 82f9489c5773291d0a7b31e34ac6ddda87cac014 Mon Sep 17 00:00:00 2001
From: "Bob (KovalenkoDm)" <kovalenkodm@mpei.ru>
Date: Mon, 18 Mar 2024 15:38:38 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BC=D0=B8=D0=BD=D0=B8=D0=BC?=
 =?UTF-8?q?=D1=83=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Убрал конфилкт
---
 main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.cpp b/main.cpp
index 1b473e5..40e5c9b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,6 +9,7 @@ int main() {
         << "A - B = " << a - b << '\n'
         << "A * B = " << a * b << '\n'
         << "A / B = " << a / b << '\n'
-        << "Max of numbers is " << (a > b? a: b);
+        << "Max of numbers is " << (a > b? a: b)
+        << "Min of numbers is " << (a < b? a: b);
     return 0;
 }