[dev] merge.php patch

[Ben Chavet]

Index: merge.php
===================================================================
RCS file: /repository/horde/scripts/merge.php,v
retrieving revision 1.13
diff -u -r1.13 merge.php
--- merge.php   8 Feb 2005 22:22:34 -0000       1.13
+++ merge.php   9 Feb 2005 01:56:21 -0000
@@ -31,7 +31,7 @@
     }
}

-while ((!feof(STDIN)) {
+while (!feof(STDIN)) {
     $line = fgets(STDIN);
     $line = trim($line);
     if (empty($line)) {