oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed problem with git svn dcommit...

Browse source
This commit is contained in:
Doug Bell 2009-05-15 18:14:16 +00:00
parent 75d1856ea7
commit 21452ce58f
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI/Operation/User.pm
View file

@ -325,8 +325,6 @@ sub getUserSearchForm {
return $output;
}
<<<<<<< HEAD:lib/WebGUI/Operation/User.pm
=======
#-------------------------------------------------------------------
=head2 www_ajaxCreateUser ( )
@ -544,7 +542,6 @@ sub www_ajaxUpdateUser {
user => $user->get,
} );
}
>>>>>>> added services to create, update, and delete users:lib/WebGUI/Operation/User.pm
#-------------------------------------------------------------------