summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-03-16 15:25:38 +0100
committerMichael Adam <obnox@samba.org>2012-03-16 19:13:32 +0100
commit15eaaa095fd3cb9a687d9b82fb7f9be2dc5a54b1 (patch)
tree1b9126d7eb71850b9ccf7a4c93f9612e3caf87f9 /source4/scripting/python
parent0c06eb48ab5a7e053b5dd162210f85a6611abd0f (diff)
downloadsamba-15eaaa095fd3cb9a687d9b82fb7f9be2dc5a54b1.tar.gz
samba-15eaaa095fd3cb9a687d9b82fb7f9be2dc5a54b1.tar.bz2
samba-15eaaa095fd3cb9a687d9b82fb7f9be2dc5a54b1.zip
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
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/samba/netcmd/user.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index 82c1b2c656..f44ebcaa69 100644
--- 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]"