jan 2005-08-03 04:30:33 PDT Modified files: scripts merge.php Log: Fix undefined variables. Revision Changes Path 1.20 +9 -2 horde/scripts/merge.php Chora Links: http://cvs.horde.org/diff.php/horde/scripts/merge.php?r1=1.19&r2=1.20&ty=u