[cvs] commit: horde/scripts merge.php

[Marko Djukic]

mdjukic     2005-11-16 10:32:52 PST

  Modified files:
    scripts              merge.php 
  Log:
  right, this should override the .cvsrc file
  
  Revision  Changes    Path
  1.24      +2 -2      horde/scripts/merge.php

  Chora Links:
  http://cvs.horde.org/diff.php/horde/scripts/merge.php?r1=1.23&r2=1.24&ty=u