[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  15eaaa0 s4:samba-tool: remove remains of patch conflict resolution
      from  0c06eb4 Stop installing popt_common.h as its symbols are in a private library.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 15eaaa095fd3cb9a687d9b82fb7f9be2dc5a54b1
Author: Michael Adam <obnox at samba.org>
Date:   Fri Mar 16 15:25:38 2012 +0100

    s4:samba-tool: remove remains of patch conflict resolution
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Fri Mar 16 19:13:32 CET 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/samba/netcmd/user.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index 82c1b2c..f44ebca 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]"
 


-- 
Samba Shared Repository