diff mbox

Remove merge conflict marker from batman/INSTALL

Message ID 1231934576-7289-2-git-send-email-sven.eckelmann@gmx.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Sven Eckelmann Jan. 14, 2009, 12:02 p.m. UTC 
  Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
 batman/INSTALL |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
diff mbox

Patch

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
 =====================