Stefan 12f368ca1f merge conf 1		2024-10-28 13:35:33 +01:00
.idea	adds conflict variable and initialised to 0	2024-10-28 12:29:34 +01:00
Bank-Beispiel	merge conf 1	2024-10-28 13:35:33 +01:00
git.jpeg	adds picture for git explanation	2024-10-28 12:19:38 +01:00