Merge remote-tracking branch 'origin/master'

This commit is contained in:
pilar 2020-06-09 11:34:19 -04:00
commit 36374cc42e
2 changed files with 9 additions and 1 deletions

View File

@ -0,0 +1,9 @@
<component name="ProjectDictionaryState">
<dictionary name="daimon">
<words>
<w>citygml</w>
<w>openable</w>
<w>spdx</w>
</words>
</dictionary>
</component>

View File

@ -2,7 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../Concordia/libs" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../libs" vcs="Git" />
</component>
</project>