Stefan
|
edd9d1fe02
|
merge2
|
2024-10-28 14:08:00 +01:00 |
|
Stefan
|
9b9105043f
|
adds a commit
|
2024-10-28 14:01:49 +01:00 |
|
Stefan
|
e6f7a485d8
|
solved merge conf
|
2024-10-28 13:41:20 +01:00 |
|
Stefan
|
3e9427de9f
|
mergeconf 2
|
2024-10-28 13:36:55 +01:00 |
|
Stefan
|
12f368ca1f
|
merge conf 1
|
2024-10-28 13:35:33 +01:00 |
|
Stefan
|
b4d8831f47
|
adds some attribute
|
2024-10-28 13:32:02 +01:00 |
|
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 |