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