aboutsummaryrefslogtreecommitdiffstats
path: root/.idea
diff options
context:
space:
mode:
authorTharre <tharre3@gmail.com>2018-05-24 20:28:05 +0200
committerTharre <tharre3@gmail.com>2018-05-24 20:28:05 +0200
commitf5bc7925a8fbbe247972a6f0e0571cc7e92fbefa (patch)
tree25c6010b1c96de0302ac618bc3aeee61100655fe /.idea
parentf7d14a76123911f0bced08356a0c69e61147cb1b (diff)
parent58f6ea4ad233f4cbb57b57734a5067e0856b6341 (diff)
downloadsepm-groupproject-f5bc7925a8fbbe247972a6f0e0571cc7e92fbefa.tar.gz
sepm-groupproject-f5bc7925a8fbbe247972a6f0e0571cc7e92fbefa.tar.xz
sepm-groupproject-f5bc7925a8fbbe247972a6f0e0571cc7e92fbefa.zip
Merge branch 'develop'v2.0
Diffstat (limited to '.idea')
-rw-r--r--.idea/dataSources.xml4
-rw-r--r--.idea/sqldialects.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index f8c1056..9b90d71 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
- <data-source source="LOCAL" name="bev" uuid="61a88d33-7bb2-4a8d-b38f-9a1d90f0fe06">
+ <data-source source="LOCAL" name="sepm" uuid="61a88d33-7bb2-4a8d-b38f-9a1d90f0fe06">
<driver-ref>h2.unified</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.h2.Driver</jdbc-driver>
- <jdbc-url>jdbc:h2:~/bev</jdbc-url>
+ <jdbc-url>jdbc:h2:$PROJECT_DIR$/sepm</jdbc-url>
</data-source>
</component>
</project> \ No newline at end of file
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 7562c0f..1605aa7 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
- <file url="file://$PROJECT_DIR$/src/main/resources/sql/database.sql" dialect="H2" />
+ <file url="PROJECT" dialect="H2" />
</component>
</project> \ No newline at end of file