diff --git a/03-happy.sh b/03-happy.sh index caa24718..f393c1ff 100644 --- a/03-happy.sh +++ b/03-happy.sh @@ -21,4 +21,8 @@ then echo "Horayyyy!! Today is the weekend. Enjoy yourself! Be ready for the next week." else echo "Today is a weekday. Keep focus on your work." -fi \ No newline at end of file +fi + +# Git Practice #2 +echo "Git Practice #2: merged version" + diff --git a/Screenshot 2026-02-10 121048.png b/Screenshot 2026-02-10 121048.png new file mode 100644 index 00000000..b329abe5 Binary files /dev/null and b/Screenshot 2026-02-10 121048.png differ diff --git a/afterMerging.png b/afterMerging.png new file mode 100644 index 00000000..42be6a26 Binary files /dev/null and b/afterMerging.png differ