Merge remote-tracking branch 'origin/master'

This commit is contained in:
2019-02-07 23:38:31 -05:00
2 changed files with 1 additions and 6 deletions

1
.gitignore vendored
View File

@@ -149,3 +149,4 @@ fabric.properties
*.out
*.app
.idea/

6
.idea/vcs.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>