From: Sven Eckelmann <sven.eckelmann@gmx.de>
To: b.a.t.m.a.n@open-mesh.net
Subject: [B.A.T.M.A.N.] [PATCH] Remove merge conflict marker from batman/INSTALL
Date: Wed, 14 Jan 2009 13:02:56 +0100 [thread overview]
Message-ID: <1231934576-7289-2-git-send-email-sven.eckelmann@gmx.de> (raw)
In-Reply-To: <1231934576-7289-1-git-send-email-sven.eckelmann@gmx.de>
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
next prev parent reply other threads:[~2009-01-14 12:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-14 12:02 [B.A.T.M.A.N.] [PATCH] Change urls to new open-mesh third level domains Sven Eckelmann
2009-01-14 12:02 ` Sven Eckelmann [this message]
2009-01-14 15:41 ` Marek Lindner
2009-01-14 16:22 ` Sven Eckelmann
2009-01-15 5:39 ` Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1231934576-7289-2-git-send-email-sven.eckelmann@gmx.de \
--to=sven.eckelmann@gmx.de \
--cc=b.a.t.m.a.n@open-mesh.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).