From 15eaaa095fd3cb9a687d9b82fb7f9be2dc5a54b1 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 16 Mar 2012 15:25:38 +0100 Subject: s4:samba-tool: remove remains of patch conflict resolution Autobuild-User: Michael Adam Autobuild-Date: Fri Mar 16 19:13:32 CET 2012 on sn-devel-104 --- source4/scripting/python/samba/netcmd/user.py | 1 - 1 file changed, 1 deletion(-) (limited to 'source4') 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 [options]" -- cgit