From aa97504f0358dcc23de7a65f39a1c4d24f0709b7 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Tue, 16 Jun 2009 11:49:54 +0200
Subject: [PATCH] s3/docs: Fix typo.

Karolin
(cherry picked from commit 6e45c21384b8845422967ff1fa46e48de9fee1ab)
---
 docs-xml/manpages-3/net.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 9206cb804df..c63ec6ada1b 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1663,7 +1663,7 @@ This example would connect to a computer named XP as the local administrator usi
 </refsect2>
 
 <refsect2>
->>>>>>> 80d32b8... s3-docs: Fix Bug #6331. Document "net dom join/net dom unjoin".:docs-xml/manpages-3/net.8.xml
+
 <title>HELP [COMMAND]</title>
 
 <para>Gives usage information for the specified command.</para>
-- 
2.11.4.GIT