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