diff --git a/README.md b/README.md index c4244cd..e3d4d4c 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ Vivien # jrdevopsrepo -Garry -edit by vivien - -edit by vivien-2 -test pull request review rule +Harry adds this line to test the merge conflict +edit by vivien +Harry adds the second line to test the merge conflict +edit by Harry(fourth conflict attempt) +edit by vivien-3 -edit by vivien and Conflict Test -Harry has joined the repo! +harry has joined the repo(third attempt for conflict)