Resolve README merge conflict

1 month ago · 0bd736d4b7
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -4,4 +4,4 @@ Hello World!
 This change was made in the feature branch for LAB EX15.
-This change was also updated in the master branch.
+This change was also updated in the master branch for LAB EX15.
`@ -4,4 +4,4 @@ Hello World!`

	`This change was made in the feature branch for LAB EX15.`	`This change was made in the feature branch for LAB EX15.`

	`This change was also updated in the master branch.`	`This change was also updated in the master branch for LAB EX15.`