Messy merge ignore
authorChris Cormack <crc@liblime.com>
Sun, 4 Nov 2007 22:23:51 +0000 (16:23 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Sun, 4 Nov 2007 22:32:36 +0000 (16:32 -0600)
commit20988bb7414e749da0b1045ea1362376f948f84a
tree674eca8687c62368be63875fca0ce416920425cf
parentf63ce1168bf96501cfdb94e00e22f58d4fce1d4e
Messy merge ignore

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl