From 1412c9c2f6872faeed5c207521fb8853521b64e3 Mon Sep 17 00:00:00 2001
From: Kuznetsov Mikhail <mi.kuznetsov@tinkoff.ru>
Date: Thu, 7 Nov 2024 20:39:02 +0300
Subject: [PATCH 1/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catprinter.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/catprinter.py b/catprinter.py
index deb16e8..30e5464 100644
--- a/catprinter.py
+++ b/catprinter.py
@@ -1,10 +1,10 @@
 from printer import pretty_print
 
 def draw_cat():
-    cat = r"""
- /\_/\
-( o.o )
- > ^ <
+        cat = r"""
+ /\_/\      /\–/\      /\_/\
+( o.o )    |.>ω<.|    ฅ •ﻌ• ฅ
+ > ^ <      \___/      \___/
 """
     return cat
 

From 8a0a1e0da5e40333812f9334c961eaea549fdda9 Mon Sep 17 00:00:00 2001
From: loxxych <kate.cococnutt@gmail.com>
Date: Fri, 10 Oct 2025 17:31:53 +0300
Subject: [PATCH 2/4] fixed merge conflict: used fixed colors

---
 printer.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/printer.py b/printer.py
index 7bf25e5..a313157 100644
--- a/printer.py
+++ b/printer.py
@@ -1,13 +1,13 @@
 import random
 
 colors = [
-    "\033[91m",     # Red
-    "\033[92m",     # Green
-    "\033[93m",     # Yellow
-    "-\033[94m",    # Blue
-    "\033[95m",     # Magenta
-    "\033[96m",     # Cyan
-    "-\033[97m",    # White
+    "\033[91m",  # Red
+    "\033[92m",  # Green
+    "\033[93m",  # Yellow
+    "\033[94m",  # Blue
+    "\033[95m",  # Magenta
+    "\033[96m",  # Cyan
+    "\033[97m",  # White
 ]
 reset_color = "\033[0m"
 

From 047a2fc0590d253e7ae9c3b871b3349abe334ccd Mon Sep 17 00:00:00 2001
From: Kuznetsov Mikhail <mi.kuznetsov@tinkoff.ru>
Date: Thu, 7 Nov 2024 20:30:06 +0300
Subject: [PATCH 3/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=B1=D0=B5=D1=81=D0=BA=D0=BE=D0=BD=D0=B5=D1=87=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D1=86=D0=B8=D0=BA=D0=BB=20=D0=B2=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catprinter.py | 4 ++--
 main.py       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/catprinter.py b/catprinter.py
index 30e5464..7526e84 100644
--- a/catprinter.py
+++ b/catprinter.py
@@ -8,7 +8,7 @@ def draw_cat():
 """
     return cat
 
-def draw_cats(num_cats):
-    for i in range(num_cats):
+def draw_cats():
+    while True:
         pretty_print(draw_cat())
 
diff --git a/main.py b/main.py
index f6ee5aa..cebbf81 100644
--- a/main.py
+++ b/main.py
@@ -2,7 +2,7 @@
 
 def main():
 
-    draw_cats(10)
+    draw_cats()
 
 if __name__ == '__main__':
     main()

From 4da3991a151574c4d860119be0999caee63593f8 Mon Sep 17 00:00:00 2001
From: loxxych <kate.cococnutt@gmail.com>
Date: Fri, 10 Oct 2025 17:33:31 +0300
Subject: [PATCH 4/4] fixed merge conflict in catprinter: left the stop message

---
 catprinter.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/catprinter.py b/catprinter.py
index 7526e84..4fda601 100644
--- a/catprinter.py
+++ b/catprinter.py
@@ -5,6 +5,7 @@ def draw_cat():
  /\_/\      /\–/\      /\_/\
 ( o.o )    |.>ω<.|    ฅ •ﻌ• ฅ
  > ^ <      \___/      \___/
+ (press ctr+C to stop)
 """
     return cat