From 3550a9c70344d6a242ff3f734ae95a76b9372d08 Mon Sep 17 00:00:00 2001 From: "Alice (IvanovAA)" Date: Fri, 7 Nov 2025 10:23:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main.cpp b/main.cpp index 6933266..62db73c 100644 --- a/main.cpp +++ b/main.cpp @@ -11,12 +11,11 @@ int main() cout << "A * B = " << a * b << '\n'; cout << "A / B = " << a / b << '\n'; cout << "MAX = " << (a > b ? a : b) << '\n'; -<<<<<<< HEAD cout << "MIN = " << (a < b ? a : b) << '\n'; -======= + cout << "MIN = " << (a < b ? a : b) << '\n'; ->>>>>>> 4faa83512c724169d00e6679985e1927764bb2a6 + return 0; }