From 2dbf6c5246fb63f6c5b36769e27d0c4b117e992e Mon Sep 17 00:00:00 2001 From: Steve Harris Date: Thu, 28 Apr 2016 15:53:08 -0500 Subject: [PATCH] Omaha #5229 - removed merge markings Former-commit-id: e7b2f343af9e341265240e7694dc5252656a9b99 --- .../utility/edex_static/base/config/gfe/serverConfig.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py index 4f8104a6db..13d9797cb9 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py @@ -3153,7 +3153,6 @@ DATABASES = [ # Intersite coordination database parameter groupings, based on # OFFICIALDBS, but time constraint is always TC1 ISCPARMS = [] -<<<<<<< HEAD if type(officeType) != str: raise TypeError, "Office type not a str: " + `officeType` else: @@ -3161,9 +3160,6 @@ else: raise ValueError, "Office type: " + str(officeType) + " does not match any of the following: [" + (', '.join(VALID_OFFICE_TYPES)) + "]" -======= - ->>>>>>> master_16.2.2 # # new parameters for NewTerrain #