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/sqldialects.xml | |
| 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/sqldialects.xml')
| -rw-r--r-- | .idea/sqldialects.xml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |