6 Commits (7c06711460b95ed2ef3be5d1df2bdbcc795d72ce)

Author	SHA1	Message	Date
Stefan	7c06711460	resolves merge conf	2024-10-28 12:33:16 +01:00
Stefan	832178fd37	changes conflict to 2	2024-10-28 12:31:29 +01:00
Stefan	885ee17cad	changes conflict to 1	2024-10-28 12:30:31 +01:00
Stefan	b521d30752	adds conflict variable and initialised to 0	2024-10-28 12:29:34 +01:00
Stefan	a31ef80ad7	adds picture for git explanation	2024-10-28 12:19:38 +01:00
Stefan	eb4d0b5b76	initial commit	2022-11-14 15:30:09 +01:00