xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #5229 - removed merge markings

Browse source 
Former-commit-id: e7b2f343af9e341265240e7694dc5252656a9b99
This commit is contained in:
Steve Harris 2016-04-28 15:53:08 -05:00
parent 679e9a532a
commit 2dbf6c5246
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
View file

@ -3153,7 +3153,6 @@ DATABASES = [
# Intersite coordination database parameter groupings, based on # Intersite coordination database parameter groupings, based on
# OFFICIALDBS, but time constraint is always TC1 # OFFICIALDBS, but time constraint is always TC1
ISCPARMS = [] ISCPARMS = []
<<<<<<< HEAD
if type(officeType) != str: if type(officeType) != str:
raise TypeError, "Office type not a str: " + `officeType` raise TypeError, "Office type not a str: " + `officeType`
else: else:
@ -3161,9 +3160,6 @@ else:
raise ValueError, "Office type: " + str(officeType) + " does not match any of the following: [" + (', '.join(VALID_OFFICE_TYPES)) + "]" 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 # new parameters for NewTerrain
# #