From 3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 19 Jun 2016 21:47:04 -0700
Subject: merge conflict

---
 boot.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'boot.php')

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
 }
 
 /**
-- 
cgit v1.2.3