From b035298e30a5caebbf9dbb7b57ad4e17497b2abf Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 6 Jul 2011 09:43:42 +0200
Subject: preparing for 6.3.2

---
 doc/manual.html | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'doc/manual.html')

diff --git a/doc/manual.html b/doc/manual.html
index 1131fb7a..19dcadb5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,15 +19,7 @@ rsyslog support</a> available directly from the source!</p>
 <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
 to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
 project goals.</p>
-<<<<<<< HEAD
-<p><b>This documentation is for version 6.3.1 (devel branch) of rsyslog.</b>
-=======
-<<<<<<< HEAD
-<p><b>This documentation is for version 6.1.10 (beta branch) of rsyslog.</b>
-=======
-<p><b>This documentation is for version 5.8.2 (v5-stable branch) of rsyslog.</b>
->>>>>>> 68a01594000b788e530ee8f716545dafccf85982
->>>>>>> 8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a
+<p><b>This documentation is for version 6.3.2 (devel branch) of rsyslog.</b>
 Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
 to obtain current version information and project status.
 </p><p><b>If you like rsyslog, you might
-- 
cgit