aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-19 21:47:04 -0700
committerredmatrix <git@macgirvin.com>2016-06-19 21:47:04 -0700
commit3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926 (patch)
treef760b34dd60a94b4cba6b6f18fb4e5f175676506
parent953ca2c21ea9c1cc3390d153964a8979b466ed6d (diff)
downloadvolse-hubzilla-3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926.tar.gz
volse-hubzilla-3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926.tar.bz2
volse-hubzilla-3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926.zip
merge conflict
-rwxr-xr-xboot.php6
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
}
/**