4 Commits (832178fd37debea299eb3f83ff157e25e2e0b04e)

Author	SHA1	Message	Date
Stefan	832178fd37	changes conflict to 2	2024-10-28 12:31:29 +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