Skip to content

Commit

Permalink
Conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
mumugisha committed Jun 2, 2023
2 parents 83493f0 + 5cc4c42 commit d4b067b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 1 deletion.
Empty file added 0x01-git/bash/98
Empty file.
1 change: 1 addition & 0 deletions 0x01-git/bash/alx
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/bash
echo "ALX School is so cool!"
echo "ALX School"
2 changes: 1 addition & 1 deletion 0x01-git/bash/school
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
echo "School"
echo "The school is open!"

0 comments on commit d4b067b

Please sign in to comment.