Fix merge conflicts

evennia/server/portal/portal.py

@@ -11,6 +11,7 @@ from builtins import object
 
 import sys
 import os
+import time
 
 from os.path import dirname, abspath
 from twisted.application import internet, service
@@ -114,6 +115,8 @@ class Portal(object):
         self.server_restart_mode = "shutdown"
         self.server_info_dict = {}
 
+        self.start_time = time.time()
+
         # in non-interactive portal mode, this gets overwritten by
         # cmdline sent by the evennia launcher
         self.server_twistd_cmd = self._get_backup_server_twistd_cmd()