CHANGELOG.rst: remove stray git conflict marker - archiso32 - Archlinux32 iso tools

Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.

summary refs log tree commit diff

path: root/.editorconfig

diff options

author	nl6720 <nl6720@gmail.com>	2023-05-17 17:36:27 +0300
committer	nl6720 <nl6720@gmail.com>	2023-05-17 17:36:59 +0300
commit	7f1632334bd4a1a3a69af68baca338eec09e643b (patch)
tree	a0881883db4e36684eec270c03e28d304155c309 /.editorconfig
parent	493aa90fd2250ebfe37598eb933550e635adbc4b (diff)

CHANGELOG.rst: remove stray git conflict marker

Fixes 8cc0e9e5b09d504a50701a825f0ab9992ed73b6f

Diffstat (limited to '.editorconfig')

0 files changed, 0 insertions, 0 deletions