# Conflicts: # .idea/artifacts/GDMS_war_exploded.xml # .idea/dataSources.xml # .idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml # .idea/libraries/tomcat_lib.xml # .idea/misc.xml # GDMS.iml