[cvs] commit: framework/devtools horde-merge.php

[Jan Schneider]

jan         2008-03-31 13:35:34 EDT

  Modified files:
    devtools             horde-merge.php 
  Log:
  Fix merging files from the Attic, in all cases.
  
  Revision  Changes    Path
  1.5       +2 -4      framework/devtools/horde-merge.php

  Chora Links:
  http://cvs.horde.org/diff.php/framework/devtools/horde-merge.php?r1=1.4&r2=1.5&ty=u