1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00

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
This commit is contained in:
Michael Adam
2012-03-16 15:25:38 +01:00
parent 0c06eb48ab
commit 15eaaa095f

View File

@ -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]"