diff options
| -rwxr-xr-x | po/fix-merge.awk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/po/fix-merge.awk b/po/fix-merge.awk new file mode 100755 index 00000000..ec9e253b --- /dev/null +++ b/po/fix-merge.awk @@ -0,0 +1,6 @@ +#! /usr/bin/gawk -f + +/^<<<<<<< HEAD/ { next } +/^=======/, /^>>>>>>> / { next } + +{ print } |