[cvs] commit: ansel/templates/view gallery.inc gallerylightbox.inc

[Michael Rubinsky]

mrubinsk    2008-10-17 13:50:44 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    templates/view       gallery.inc gallerylightbox.inc 
  Log:
  Yet Another place where the merge failed
  
  Revision   Changes    Path
  1.173.2.3  +3 -3      ansel/templates/view/gallery.inc
  1.22.2.7   +3 -3      ansel/templates/view/gallerylightbox.inc

  Chora Links:
  http://cvs.horde.org/diff.php/ansel/templates/view/gallery.inc?r1=1.173.2.2&r2=1.173.2.3&ty=u
  http://cvs.horde.org/diff.php/ansel/templates/view/gallerylightbox.inc?r1=1.22.2.6&r2=1.22.2.7&ty=u