r7581: fix bad merge
authorGerald Carter <jerry@samba.org>
Tue, 14 Jun 2005 19:04:39 +0000 (19:04 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 15:57:14 +0000 (10:57 -0500)
commit55d08311032b75724b525d8e0df506de3e988b15
tree252e730b05c498625edd2c29e86988f411fe4cb8
parent643dc05eb5a8e41cf9cb1768ef42f5dbc0320846
r7581: fix bad merge
source/rpc_server/srv_samr_nt.c