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