From 258202e0e020540250639a860e9fc224fc431d6f Mon Sep 17 00:00:00 2001
From: "Francisco J. Cano Sandoval" <fjcs@tid.es>
Date: Fri, 16 Nov 2012 14:07:15 +0100
Subject: [PATCH] Modified foo in fork

---
 foo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.