Solution

mate-academy · Oct 25, 2023 · b35b440 · b35b440
2 parents dcff750 + a785ecf
commit b35b440
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app/main.py b/app/main.py
@@ -1,5 +1,9 @@
 class Animal:
+<<<<<<< HEAD
     alive = []
+=======
+    alive= []
+>>>>>>> a785ecfbd412b849653930adc5e49ba6635d744f
 
     def __init__(
             self,