r7581: fix bad merge
commit2efa26ec1d344f364cf2734a7f18404e79c876e6
authorGerald Carter <jerry@samba.org>
Tue, 14 Jun 2005 19:04:39 +0000 (14 19:04 +0000)
committerGerald Carter <jerry@samba.org>
Tue, 14 Jun 2005 19:04:39 +0000 (14 19:04 +0000)
tree252e730b05c498625edd2c29e86988f411fe4cb8
parentd07c37469606b21f79e992c856b2fb28aff0d066
r7581: fix bad merge
source/rpc_server/srv_samr_nt.c