From patchwork Wed Jan 14 12:02:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 5365 Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (8.14.3/8.13.4/Debian-3sarge3) with SMTP id n0EC4ZKv022520 for ; Wed, 14 Jan 2009 12:04:36 GMT Received: (qmail invoked by alias); 14 Jan 2009 12:03:07 -0000 Received: from unknown (EHLO localhost) [89.246.205.210] by mail.gmx.net (mp006) with SMTP; 14 Jan 2009 13:03:07 +0100 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX1/EQT5K1rbEecKCS0XSLfaARw2HfdfXzj4Yo29kgg aHp9Qks87gHv+P From: Sven Eckelmann To: b.a.t.m.a.n@open-mesh.net Date: Wed, 14 Jan 2009 13:02:56 +0100 Message-Id: <1231934576-7289-2-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1231934576-7289-1-git-send-email-sven.eckelmann@gmx.de> References: <1231934576-7289-1-git-send-email-sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 X-FuHaFi: 0.67 Subject: [B.A.T.M.A.N.] [PATCH] Remove merge conflict marker from batman/INSTALL X-BeenThere: b.a.t.m.a.n@open-mesh.net X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jan 2009 12:04:36 -0000 Signed-off-by: Sven Eckelmann --- 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 =====================