selsky 2006-02-13 21:53:06 PST Modified files: scripts merge.php Log: Revert. Revision Changes Path 1.26 +4 -4 horde/scripts/merge.php Chora Links: http://cvs.horde.org/diff.php/horde/scripts/merge.php?r1=1.25&r2=1.26&ty=u