| commit | 15eaaa095fd3cb9a687d9b82fb7f9be2dc5a54b1 | |
| author | Michael Adam <obnox@samba.org> | |
| Fri, 16 Mar 2012 14:25:38 +0000 (16 15:25 +0100) | ||
| committer | Michael Adam <obnox@samba.org> | |
| Fri, 16 Mar 2012 18:13:32 +0000 (16 19:13 +0100) | ||
| tree | 1b9126d7eb71850b9ccf7a4c93f9612e3caf87f9 | treesnapshot (tar.gz zip) |
| parent | 0c06eb48ab5a7e053b5dd162210f85a6611abd0f | commitdiff |
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
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Mar 16 19:13:32 CET 2012 on sn-devel-104
| source4/scripting/python/samba/netcmd/user.py | diffblobblamehistory |