cmerkens 80d48d5335 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph ... # Conflicts: # graph/EdgeMarking.java # out/production/ProjektGraph/graph/EdgeWeightMarking.class		2024-07-07 23:41:01 +02:00
..
production/ProjektGraph	Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph	2024-07-07 23:41:01 +02:00