From b72605e2f5ba868e880e4ee9cf48097823796e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= <hello@rafa.ee>
Date: Wed, 3 Dec 2025 14:06:24 +0100
Subject: [PATCH] Extend gettext conflict script to other conflict marker
 styles

---
 Justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Justfile b/Justfile
index a91c0e4..856036e 100644
--- a/Justfile
+++ b/Justfile
@@ -90,4 +90,4 @@ clean:
 remove-gettext-conflicts:
   #!/usr/bin/env bash
   set -euo pipefail
-  find priv/gettext -type f -exec sed -i '/^<<<<<<< HEAD$/d; /^=======$/d; /^>>>>>>>/d' {} \;
\ No newline at end of file
+  find priv/gettext -type f -exec sed -i '/^<<<<<<</d; /^=======$/d; /^>>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//' {} \;
\ No newline at end of file