summaryrefslogtreecommitdiff
path: root/.idea/misc.xml
diff options
context:
space:
mode:
Diffstat (limited to '.idea/misc.xml')
-rw-r--r--.idea/misc.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index a7e5d8b..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <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