merge due to non empty Repo on genivi git server. Resolving conflics in the READMEFILE

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