diff --git a/testgit.text b/testgit.text index c6f6477..54b13f1 100644 --- a/testgit.text +++ b/testgit.text @@ -1,4 +1,5 @@ hello world! code from branch feature-a +asldjkflasdjfslfjd This will be conflict!!! another text