resolve merge conflict

2016-07-18 13:50:32 +02:00
parent 571b8cc85b f44ca74e99
commit 4371e6ad97
2 changed files with 3 additions and 1 deletions
--- a/boot.php
+++ b/boot.php
@@ -44,7 +44,9 @@ require_once('include/account.php');


 define ( 'PLATFORM_NAME',           'hubzilla' );
+
 define ( 'STD_VERSION',             '1.11' );
+
 define ( 'ZOT_REVISION',            '1.1' );

 define ( 'DB_UPDATE_VERSION',       1180  );