Merge commit '0fd1c1d0' into thread-next

Browse Source

Using the "ours" strategy as the changes introduced in merged commits
are already implemented in thread-next in a different way.

...

This commit is contained in:

Maria Matejka 2022-09-20 09:52:03 +02:00

parent 28427a68c3 0fd1c1d091

commit 5d7b2676a1

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available