Merge remote-tracking branch 'remotes/origin/wmj'

# Conflicts: # .idea/artifacts/gdms_Web_exploded.xml # .idea/modules.xml # GDMS.iml
6 years ago · 049984695c
parent a1c83ce362 1dfcd61fac
commit 049984695c
1 changed files with 0 additions and 1 deletions
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -2,6 +2,5 @@
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
  </component>
 </project>