From: martin f. krafft <madduck@madduck.net>
Date: Thu, 10 Apr 2025 11:03:14 +0000 (+0200)
Subject: Remove conflict markers accidentally checked in
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/507b8776082bc89b2cabb779aff9ca9f4943ebbe?hp=507b8776082bc89b2cabb779aff9ca9f4943ebbe

Remove conflict markers accidentally checked in
---