From fac3b42413f877ec010aa4ba507fcdbfa4c9c54d Mon Sep 17 00:00:00 2001 From: Sona Markosyan Date: Tue, 1 Feb 2022 14:11:49 +0100 Subject: [PATCH] merge conflict resolved --- .../java/hs/fulda/de/ci/exam/project/Itinerary.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/main/java/hs/fulda/de/ci/exam/project/Itinerary.java diff --git a/src/main/java/hs/fulda/de/ci/exam/project/Itinerary.java b/src/main/java/hs/fulda/de/ci/exam/project/Itinerary.java new file mode 100644 index 0000000..4d1d189 --- /dev/null +++ b/src/main/java/hs/fulda/de/ci/exam/project/Itinerary.java @@ -0,0 +1,10 @@ +package hs.fulda.de.ci.exam.project; + +import java.util.ArrayList; + +public class Itinerary { + + public Itinerary(Airport start_airport, Airport final_airport) { + + } +} \ No newline at end of file