cool

ibnAbuMahdi · Aug 26, 2022 · 7b00ca4 · 7b00ca4
1 parent cbf06b1
commit 7b00ca4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/0x01-git/bash/alx b/0x01-git/bash/alx
@@ -1,6 +1,4 @@
 #!/bin/bash
-<<<<<<< HEAD
 echo "ALX School is so cool!"
-=======
-echo "ALX School is so cool!"
->>>>>>> master
+
+