diff options
Diffstat (limited to '.idea/FOSSEE_animations.iml')
| -rw-r--r-- | .idea/FOSSEE_animations.iml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.idea/FOSSEE_animations.iml b/.idea/FOSSEE_animations.iml index 201c35f..03a8da7 100644 --- a/.idea/FOSSEE_animations.iml +++ b/.idea/FOSSEE_animations.iml @@ -14,7 +14,11 @@ </component> <component name="NewModuleRootManager"> <content url="file://$MODULE_DIR$" /> +<<<<<<< HEAD <orderEntry type="jdk" jdkName="Python 2.7" jdkType="Python SDK" /> +======= + <orderEntry type="inheritedJdk" /> +>>>>>>> f79913639bc283c945a392d641e84b0a70a97eda <orderEntry type="sourceFolder" forTests="false" /> </component> <component name="TemplatesService"> |