diff --git a/testfile2 b/testfile2 index 08ae3bb06..d56080a96 100644 --- a/testfile2 +++ b/testfile2 @@ -1,5 +1,8 @@ <<<<<<< HEAD +<<<<<<< HEAD This is line1. This is line2. ======= >>>>>>> parent of f5161cf... created test file +======= +>>>>>>> parent of f5161cf... created test file