From 0108869db26775b5e30028b0956adb2007020a10 Mon Sep 17 00:00:00 2001
From: blacky <blacky@kiwi.(none)>
Date: Tue, 5 Jul 2011 20:51:58 +0200
Subject: merge due to non empty Repo on genivi git server. Resolving conflics
 in the READMEFILE

---
 README | 1 -
 1 file changed, 1 deletion(-)

(limited to 'README')

diff --git a/README b/README
index cccd2dd..7b0271e 100644
--- a/README
+++ b/README
@@ -225,4 +225,3 @@ To use make out of eclipse them, replace the default make command "make" with so
                        `---'                     `---'
 
 
-
-- 
cgit v1.2.1