merged my dogs

hcs · Nov 28, 2023 · acd8027 · acd8027
2 parents c2c6391 + b26d6aa
commit acd8027
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/dog.c b/dog.c
@@ -1,3 +1,21 @@
+<<<<<<< HEAD
 rocky
 tommy
 bruno
+=======
+puppy
+canine
+wolf
+bark
+bow wow
+pikachu
+charmander
+squirtle
+bulbasaur
+charmelon
+charizard
+ivysaur
+venasaur
+wartortle
+blastoise
+>>>>>>> origin/merge-exercise