Fixing mess leftover from conflict
authorChris Cormack <chris@bigballofwax.co.nz>
Tue, 15 Sep 2009 01:55:19 +0000 (13:55 +1200)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 16 Sep 2009 21:19:49 +0000 (23:19 +0200)
commitb63fff5ba4f7ebffb4e40aab4fe014f7fd89c69f
tree88d9ab93418d79a755bcafbbd3128a76d3fc26a3
parentc63bec48553abdd39d537ed14b04d5ad47a77118
Fixing mess leftover from conflict
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl