pbd2h21avi deeabfd2ad Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/Order.java		2023-02-01 12:42:34 +01:00
.idea	Merge remote-tracking branch 'origin/master'	2023-02-01 12:42:34 +01:00
out/production/VPR_SCRIPT	Merge remote-tracking branch 'origin/master'	2023-02-01 12:42:23 +01:00
src	Merge remote-tracking branch 'origin/master'	2023-02-01 12:42:23 +01:00
menue.txt	txt angepasst	2022-12-18 11:48:51 +01:00
orders2.txt	changeOrder methode ergänzt + test order files	2023-01-17 17:03:44 +01:00
orders.txt	changeOrder methode ergänzt + test order files	2023-01-17 17:03:44 +01:00
test2.csv	Test?	2022-11-24 13:59:26 +01:00
test.csv	Test?	2022-11-24 13:59:26 +01:00
user.txt	user.txt angepasst	2022-12-14 20:34:17 +01:00
VPR_SCRIPT.iml	Test?	2022-11-24 13:59:26 +01:00