summaryrefslogtreecommitdiff
path: root/i18n/status.sh
Side-by-side diff
Diffstat (limited to 'i18n/status.sh') (more/less context) (ignore whitespace changes)
-rwxr-xr-xi18n/status.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/i18n/status.sh b/i18n/status.sh
index 2eef724..b669bf2 100755
--- a/i18n/status.sh
+++ b/i18n/status.sh
@@ -14,7 +14,6 @@ echo
echo "Status of $foo"
echo
->>>>>>> 1.4
echo "number of strings: "
strs=`find $arg -name "*.ts" -exec cat {} \; | grep translation | wc -l`
echo $strs