jj/demos/resolve_conflicts.png
Martin von Zweigbergk 91775fc4f6 demos: update with recent changes
I had to modify the operation log a bit to fit on my scren with #1221
fixed.

Closes #1221.
2023-02-14 22:12:23 -08:00

261 KiB
815x1304px