Stefan 3e9427de9f mergeconf 2		2024-10-28 13:36:55 +01:00
.idea	adds conflict variable and initialised to 0	2024-10-28 12:29:34 +01:00
Bank-Beispiel	mergeconf 2	2024-10-28 13:36:55 +01:00
git.jpeg	adds picture for git explanation	2024-10-28 12:19:38 +01:00