local-it/mitgliederverwaltung
2
3
Fork 0
Code Issues 51 Pull requests 14 Projects 1 Releases Packages 1 Activity Actions

Extend gettext conflict script to other conflict marker styles

Browse source
This commit is contained in:
Rafael Epplée 2025-12-03 14:06:24 +01:00
parent cd1af5aff5
commit 4057b2d631
No known key found for this signature in database
GPG key ID: B4EFE6DC59FAE118
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Justfile
View file

@ -90,7 +90,7 @@ clean:
remove-gettext-conflicts: remove-gettext-conflicts:
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
find priv/gettext -type f -exec sed -i '/^<<<<<<< HEAD$/d; /^=======$/d; /^>>>>>>>/d' {} \; find priv/gettext -type f -exec sed -i '/^<<<<<<</d; /^=======$/d; /^>>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//' {} \;
# Production environment commands # Production environment commands
# ================================ # ================================