diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-19 21:47:04 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-19 21:47:04 -0700 |
| commit | 3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926 (patch) | |
| tree | f760b34dd60a94b4cba6b6f18fb4e5f175676506 /boot.php | |
| parent | 953ca2c21ea9c1cc3390d153964a8979b466ed6d (diff) | |
| download | volse-hubzilla-3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926.tar.gz volse-hubzilla-3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926.tar.bz2 volse-hubzilla-3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926.zip | |
merge conflict
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -1744,13 +1744,7 @@ function goaway($s) { } function shutdown() { -<<<<<<< HEAD - global $db; - if(is_object($db) && $db->connected) - $db->close(); -======= ->>>>>>> 1.8RC } /** |