From 74ec307700a2c12739f8bb509f7f1820355a93c5 Mon Sep 17 00:00:00 2001
From: poltawski <poltawski>
Date: Sun, 13 Jan 2008 18:55:47 +0000
Subject: [PATCH] reverting bad commit, sorry

---
 admin/settings.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/admin/settings.php b/admin/settings.php
index a5ad4e79868..0ee67a3cc1d 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -21,7 +21,6 @@ $PAGE->init_extra($section); // hack alert!
 $adminediting = optional_param('adminedit', -1, PARAM_BOOL);
 $return       = optional_param('return','', PARAM_ALPHA);
 
-<<<<<<< settings.php
 if (!isset($USER->adminediting)) {
     $USER->adminediting = false;
 }
@@ -35,10 +34,6 @@ if ($PAGE->user_allowed_editing()) {
 }
 
 $adminroot = admin_get_root();
-=======
-/// no guest autologin
-require_login(0, false);
->>>>>>> 1.40.2.3
 
 $root = $adminroot->locate($PAGE->section);