From f630659e1ecfd4969b9ccca7e6c6a2a3908148fe Mon Sep 17 00:00:00 2001 From: "Bob (GrudininYK)" Date: Sun, 14 Apr 2024 21:59:13 +0300 Subject: [PATCH 1/2] =?UTF-8?q?code:=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BC=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=D1=83=D0=BC=D0=B0=20=D0=B8?= =?UTF-8?q?=20=D0=BC=D0=B8=D0=BD=D0=B8=D0=BC=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, 3 deletions(-) diff --git a/main.cpp b/main.cpp index 7fe6952..3071be2 100644 --- a/main.cpp +++ b/main.cpp @@ -11,18 +11,15 @@ int main() << "A - B = " << a - b << '\n' << "A * B = " << a * b << '\n' << "A / B = " << a / b << '\n'; -<<<<<<< HEAD if ( a > b ) { cout << "maximum: " << a; } else { cout << "maximum: " << b; -======= if ( a < b ) { cout << "minimum: " << a; } else { cout << "minimum: " << b; ->>>>>>> ec0eaf5 (code: вывод минимального числа) } } From 967b180d8a7881c7c60b1196ea79cbbdb500be2b Mon Sep 17 00:00:00 2001 From: "Bob (GrudininYK)" Date: Sun, 14 Apr 2024 22:36:02 +0300 Subject: [PATCH 2/2] =?UTF-8?q?code:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.cpp b/main.cpp index 3071be2..ae79385 100644 --- a/main.cpp +++ b/main.cpp @@ -16,10 +16,12 @@ int main() } else { cout << "maximum: " << b; + } if ( a < b ) { cout << "minimum: " << a; } else { cout << "minimum: " << b; } + return 0; }