1 files changed, 0 insertions, 6 deletions
diff --git a/boot.php b/boot.php
index a297bb732..a767a18d4 100755
--- a/boot.php
+++ b/boot.php
@@ -1744,13 +1744,7 @@ function goaway($s) {
 }
 
 function shutdown() {
-<<<<<<< HEAD
-	global $db;
-	if(is_object($db) && $db->connected)
-		$db->close();
-=======
 
->>>>>>> 1.8RC
 }
 
 /**