merge conflict

2016-06-19 21:47:04 -07:00 · 2016-06-19 21:47:04 -07:00 · 3cf6f1f79c
commit 3cf6f1f79c
parent 953ca2c21e
1 changed files with 0 additions and 6 deletions
--- 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
 }

 /**