diff --git a/02-add_nums.sh b/02-add_nums.sh index 2fd13cb..46410c7 100644 --- a/02-add_nums.sh +++ b/02-add_nums.sh @@ -13,3 +13,8 @@ echo "The sum is $sum" # exercise: ask the user for the width and height and present total # number of pixels + + +echo "This is my MAIN branch version" + +echo "This is my PARALLEL branch version" diff --git a/after-merging.png b/after-merging.png new file mode 100644 index 0000000..cb751fe Binary files /dev/null and b/after-merging.png differ diff --git a/dominique.sh b/dominique.sh new file mode 100644 index 0000000..ee5d29a --- /dev/null +++ b/dominique.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +echo "Welcome, Dominique McClaney" +