r7581: fix bad merge
commitcfe893375473f6d12fd806347827baa615f0cd0a
authorGerald Carter <jerry@samba.org>
Tue, 14 Jun 2005 19:04:39 +0000 (14 19:04 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 15:57:14 +0000 (10 10:57 -0500)
tree681f6644bfb0060d4c4cc3ac1dc1e0f421f4b2c3
parent6109b8ad9dd586dad508658c65e33d012cad42b1
r7581: fix bad merge
(This used to be commit 55d08311032b75724b525d8e0df506de3e988b15)
source3/rpc_server/srv_samr_nt.c