aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application
diff options
context:
space:
mode:
authorAndreas Weninger <e01526989@student.tuwien.ac.at>2018-05-24 17:51:36 +0200
committerAndreas Weninger <e01526989@student.tuwien.ac.at>2018-05-24 17:51:36 +0200
commit61d4d58c1e3b2bb2f18f55bcb4c5ed5e574006c3 (patch)
treea39e8033aeda4472d846cae1ef84bd761e673e53 /src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application
parent7b752f03f77e1734c1c75927ec14909f5755ecc3 (diff)
parent716bf9fd75aff4d22ee6055961b2d0c4cae2fb11 (diff)
downloadsepm-groupproject-61d4d58c1e3b2bb2f18f55bcb4c5ed5e574006c3.tar.gz
sepm-groupproject-61d4d58c1e3b2bb2f18f55bcb4c5ed5e574006c3.tar.xz
sepm-groupproject-61d4d58c1e3b2bb2f18f55bcb4c5ed5e574006c3.zip
Merge remote-tracking branch 'origin/develop' into develop
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;