Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

1 files changed, 3 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index ca2ee5d47..1c8901f7b 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,6 @@ require_once('include/xchan.php');
 require_once('include/hubloc.php');
 
 
-
 define ( 'PLATFORM_NAME',           'red' );
 define ( 'STD_VERSION',             '5.3' );
 
@@ -2301,7 +2300,10 @@ function cert_bad_email() {
 			)
 		]
 	);
+<<<<<<< HEAD
 
+=======
+>>>>>>> 95f4f14dca1ea982f67cccb31d860f7b8ed9055c
 }