[B.A.T.M.A.N.] [PATCH] Remove merge conflict marker from batman/INSTALL

14 Jan 2009

Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de
---
 batman/INSTALL |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/batman/INSTALL b/batman/INSTALL
index 3f44760..96e9114 100644
--- a/batman/INSTALL
+++ b/batman/INSTALL
@@ -3,11 +3,6 @@
 B.A.T.M.A.N. Installation and Usage
 ###################################
-<<<<<<< .mine
-
-
-=======
->>>>>>> .r1182
 Compiling from source
 =====================
-- 
1.6.0.6


    