Namen
Erster Merge
Wichtige Änderung
Bahns
Neue Store Proced
Fehler
Merge branch 'master' into K2_master

Conflicts:
	Test1.StoredProcedure.sql
Merge Conflict
Änderung
Merge remote-tracking branch 'refs/remotes/origin/K1_dev' into K1_dev-2