Resolve README merge conflict

1 month ago · 223977275b
1 changed files with 3 additions and 1 deletions
--- a/2
+++ b/2
@ -3,3 +3,5 @@ Hello World!
 ## Feature Branch

 This change was made in the feature branch for LAB EX15.
+
+This change was also updated in the master branch.