public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge commit 'gallery3-contrib/master'

Browse Source
This commit is contained in:
rWatcher 2009-11-08 00:44:56 -05:00
parent 898844933b
commit f627e9a407
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/register/models/pending_user.php
View File

@ -17,17 +17,5 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
<<<<<<< HEAD:modules/ldap/config/ldap.php
$config = array(
"groups" => array("eng", "google", "prebuild", "guest"),
"everybody_group" => "guest",
"registered_users_group" => "google",
"admins" => array("mediratta"),
"url" => "ldaps://ldap.corp.google.com/",
"group_domain" => "ou=Posix,ou=Groups,dc=google,dc=com",
"user_domain" => "ou=People,dc=google,dc=com",
);
=======
class Pending_user_Model extends ORM {
}
>>>>>>> gallery3-contrib/master:modules/register/models/pending_user.php
}