conflict from merge resolved

chi1034 · Aug 3, 2023 · bc79f1c · bc79f1c
2 parents 38d5047 + b4f8ab1
commit bc79f1c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/0x03-git/bash/98 b/0x03-git/bash/98
diff --git a/0x03-git/bash/school b/0x03-git/bash/school
@@ -1,2 +1,2 @@
 #!/bin/bash
-echo "School"
+echo "The school is open!"