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 /src/test/resources/employeeServiceTestData.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 'src/test/resources/employeeServiceTestData.xml')
| -rw-r--r-- | src/test/resources/employeeServiceTestData.xml | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/test/resources/employeeServiceTestData.xml b/src/test/resources/employeeServiceTestData.xml deleted file mode 100644 index c21fde6..0000000 --- a/src/test/resources/employeeServiceTestData.xml +++ /dev/null @@ -1,12 +0,0 @@ -<dataset> - <EmployeeVersion id="10" name="Adam" birthday="2010-10-10" educationlevel="RS" isDriver="true" - isPilot="false"/> - <EmployeeVersion id="20" name="Max" birthday="1990-11-11" educationlevel="NFS" isDriver="false" - isPilot="false"/> - <EmployeeVersion id="30" name="Lisa" birthday="1999-10-16" educationlevel="NKI" isDriver="true" - isPilot="false"/> - - <Employee id="1" version="10" /> - <Employee id="2" version="20" /> - <Employee id="3" version="30" /> -</dataset>
\ No newline at end of file |