aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application
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 /src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application
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 'src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application')
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
index 01c04d3..d8365a7 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
@@ -1,6 +1,6 @@
package at.ac.tuwien.sepm.assignment.groupphase.application;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.CreateOperationController;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.CreateOperationController;
import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
import javafx.application.Application;
import javafx.application.Platform;