diff options
Diffstat (limited to '.idea/dataSources.xml')
| -rw-r--r-- | .idea/dataSources.xml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 954cdfa..ab6c21f 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,28 @@ <?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> + <jdbc-driver>org.sqlite.JDBC</jdbc-driver> + <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/db.sqlite3</jdbc-url> + <driver-properties> + <property name="enable_load_extension" value="true" /> + </driver-properties> + <libraries> + <library> + <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/sqlite-jdbc-3.25.1.jar</url> + </library> + <library> + <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.25.1/license.txt</url> + </library> + </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> |