diff --git a/foo b/foo index 9fa9246..e74b75f 100644 --- a/foo +++ b/foo @@ -1,3 +1,3 @@ New Changes after conflicted branch. -Modified KK Foo +Foo text file modified in fork This is a new test.