From b7f0fe02a2b5b8d8adbcad338eff0cdb173364ad Mon Sep 17 00:00:00 2001
From: cniehaus <cniehaus>
Date: Fri, 20 Dec 2002 16:58:39 +0000
Subject: as nobody read this nobody will notice my stupid bug

---
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
--
cgit v0.9.0.2