Fix merge

2018-05-20 22:19:28 +02:00
parent f3b3108198 6bc9de7606
commit aee2876f7e
4 changed files with 37 additions and 7 deletions
@@ -105,3 +105,5 @@ venv.bak/

 /src/config/Config.json
 /src/config/PrivateConfig.json
+.idea/
+/external_packages/