diff options
Diffstat (limited to '.idea/misc.xml')
-rw-r--r-- | .idea/misc.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml index f99b311..a7e5d8b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,9 @@ <component name="JavaScriptSettings"> <option name="languageLevel" value="ES6" /> </component> +<<<<<<< HEAD <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7" project-jdk-type="Python SDK" /> +======= + <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" /> +>>>>>>> f79913639bc283c945a392d641e84b0a70a97eda </project>
\ No newline at end of file |