Resolved conflicts

momofAnAl · Oct 18, 2024 · 763417e · 763417e
1 parent 3165fdf
commit 763417e
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/app/routes/planets_routes.py b/app/routes/planets_routes.py
@@ -12,16 +12,5 @@ def get_all_planets():
             name=planet.name,
             description=planet.description    
         ))
-
-<<<<<<< HEAD
+
     return planets_response
-
-
-
-
-
-
-=======
-    return planets_response
-
-