cmerkens 1313402f07 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph ... # Conflicts: # OurApplication/OurAlgorithm.java # OurApplication/OurApplication.java # graph/ExampleGraphs.java # out/production/ProjektGraph/OurApplication/OurAlgorithm.class # out/production/ProjektGraph/OurApplication/OurApplication.class # out/production/ProjektGraph/OurApplication/OurParameterArea.class # out/production/ProjektGraph/graph/ExampleGraphs.class		2024-07-07 20:43:35 +02:00
..
production/ProjektGraph	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph	2024-07-07 20:43:35 +02:00