diff --git a/README.md b/README.md index b5eff8154634261ac92ee60b024dccf1e49e97f2..51af1968f93472a105ba714573e35224d556287b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # Git Laboratory This is a feature branch. +This will cause a conflict.