merge request

Browse source

...

This commit is contained in:

Julie Kirsch 2024-05-26 23:01:49 +02:00

parent 6b8c782e82

commit 38a66fa04d

3 changed files with 23 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

book/workflows/figures/Merge_Conflict_GitLab.PNG Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 37 KiB

BIN

book/workflows/figures/Solve_Conflict.PNG Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 32 KiB