From 09c75212b2c431864ac4350f5fbce6a6d7737480 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Wed, 3 Dec 2025 13:46:55 +0100
Subject: [PATCH] chore: add remove-gettext-conflicts to Justfile

---
 Justfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Justfile b/Justfile
index 907283f..a91c0e4 100644
--- a/Justfile
+++ b/Justfile
@@ -84,4 +84,10 @@ regen-migrations migration_name commit_hash='':
 clean:
     mix clean
     rm -rf .elixir_ls
-    rm -rf _build
\ No newline at end of file
+    rm -rf _build
+
+# Remove Git merge conflict markers from gettext files
+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