tree d112cf5625ef21fa4a2fa12a5ac4ea197b75f3f7
parent 5e14884c2a9ff3f14ffd448725a43694b630fdde
author David Ostrovsky <david@ostrovsky.org> 1772778652 +0100
committer David Ostrovsky <david@ostrovsky.org> 1772782176 +0100

README: Remove leftover merge conflict markers

Clean up accidental merge conflict markers left in README.md during
a previous merge.

Change-Id: I7ecf5de932d2a45b854908aae411ee11fed35e20