docs: fix readme conflict markers

This commit is contained in:
Maze Winther
2026-05-27 22:34:49 +02:00
parent 6482461a63
commit b601ab4b24