Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/misc.xml
This commit is contained in:
Spongebob-Schwammkopf
2019-07-24 08:14:36 +02:00
parent 85b927fc52
commit 3305222e93
+1 -1
View File
@@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">