diff --git a/03-happy.sh b/03-happy.sh index 485527d..f5e0f98 100644 --- a/03-happy.sh +++ b/03-happy.sh @@ -14,3 +14,10 @@ fi # exercise: write a script that prints whether today is # the weekend or not + +# Gabens’ edit for Git branching test +echo "Now we are testing Git branching by Gabens!" +for i in 1 2 3 +do + echo "This is happiness loop $i" +done diff --git a/GabensVolmar/print_name.sh b/GabensVolmar/print_name.sh new file mode 100644 index 0000000..b83ec46 --- /dev/null +++ b/GabensVolmar/print_name.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "Welcome, my name is Gabens Volmar" \ No newline at end of file diff --git a/after_merge.png b/after_merge.png new file mode 100644 index 0000000..9a40894 Binary files /dev/null and b/after_merge.png differ diff --git a/two_branches.png b/two_branches.png new file mode 100644 index 0000000..899caeb Binary files /dev/null and b/two_branches.png differ