diff options
| author | Alwin1847207 | 2019-11-04 17:44:16 +0530 |
|---|---|---|
| committer | Alwin1847207 | 2019-11-04 17:44:16 +0530 |
| commit | 46675275ffd31f22043052cd5c0a50ab0abe2cab (patch) | |
| tree | 6f9e7fed9291653c4bfb0643833d45702dfe066c /.idea/misc.xml | |
| parent | 6c741569e8ef73fe1e8773419f241891dd69a1ad (diff) | |
| parent | f79913639bc283c945a392d641e84b0a70a97eda (diff) | |
| download | FOSSEE_animations-46675275ffd31f22043052cd5c0a50ab0abe2cab.tar.gz FOSSEE_animations-46675275ffd31f22043052cd5c0a50ab0abe2cab.tar.bz2 FOSSEE_animations-46675275ffd31f22043052cd5c0a50ab0abe2cab.zip | |
changes in deleting proposal
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 |