Merge remote-tracking branch 'origin/master'

# Conflicts: # info_datei.txt
matsim-scenarios · Jun 13, 2024 · 071a2e3 · 071a2e3
2 parents 2211a50 + effd2c1
commit 071a2e3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/info_datei.txt b/info_datei.txt
@@ -1 +1,2 @@
-hier sind noch mehr infos!
+hier sind noch mehr infos!
+test test test