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