s3/docs: Fix typo.

Karolin

diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 9206cb804df988a8c855f28e5e485edb13f406e9..c63ec6ada1bdf0cbfe4352475be049e0058682cd 100644 (file)
--- 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>