diff options
| author | Viktoria Pundy <viktoria.pundy@aon.at> | 2018-05-22 20:12:57 +0200 |
|---|---|---|
| committer | Viktoria Pundy <viktoria.pundy@aon.at> | 2018-05-22 20:12:57 +0200 |
| commit | 38301afa2221ff5cc07ea73e8eaa104eee3e787f (patch) | |
| tree | 14cfeb50d61b77038b5c238913dd87d5bb799e1d /.idea | |
| parent | 3814bf2cab2cb1465002d05f68e9b38e9351e014 (diff) | |
| parent | b351bbf12564c813728cd5efe00aa986ff64b083 (diff) | |
| download | sepm-groupproject-38301afa2221ff5cc07ea73e8eaa104eee3e787f.tar.gz sepm-groupproject-38301afa2221ff5cc07ea73e8eaa104eee3e787f.tar.xz sepm-groupproject-38301afa2221ff5cc07ea73e8eaa104eee3e787f.zip | |
Merge branch 'develop' into change_operation_status_fix
# Conflicts:
# src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
# src/main/resources/fxml/CreateOperationController.fxml
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/dataSources.xml | 4 | ||||
| -rw-r--r-- | .idea/sqldialects.xml | 2 |
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 |