Skip to content

CHANGELOG.rst: remove stray git conflict marker

nl6720 requested to merge nl6720/archiso:fix-merge into master

Fixes 8cc0e9e5

Merge request reports