s4:samba-tool: remove remains of patch conflict resolution

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Mar 16 19:13:32 CET 2012 on sn-devel-104

diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index 82c1b2c6561da08990af30fdbb672a33a78f80dd..f44ebcaa69b541bde39f2bb40043355573d5af2f 100644 (file)
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/source4/scripting/python/samba/netcmd/user.py
@@ -169,7 +169,6 @@ sudo samba-tool user delete User2
 
 Example2 shows how to delete a user in the domain against the local server.   sudo is used so a user may run the command as root.
 
-<<<<<<< HEAD
 """
     synopsis = "%prog <username> [options]"