diff options
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/FOSSEE_animations.iml | 4 | ||||
| -rw-r--r-- | .idea/dataSources.xml | 4 | ||||
| -rw-r--r-- | .idea/misc.xml | 4 |
3 files changed, 12 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"> diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 4ab70d8..ab6c21f 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="DataSourceManagerImpl" format="xml" multifile-model="true"> +<<<<<<< HEAD <data-source source="LOCAL" name="db" uuid="3317de75-8f14-4f8c-8836-39847d18f321"> <driver-ref>sqlite.xerial</driver-ref> <synchronize>true</synchronize> @@ -19,6 +20,9 @@ </libraries> </data-source> <data-source source="LOCAL" name="Django default" uuid="ae398c8c-5a45-44f5-9195-355716353d9a"> +======= + <data-source source="LOCAL" name="Django default" uuid="c2ec2b16-9a8a-4975-be60-2a0417af82c8"> +>>>>>>> f79913639bc283c945a392d641e84b0a70a97eda <driver-ref>sqlite.xerial</driver-ref> <synchronize>true</synchronize> <imported>true</imported> 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 |