]> git.koha-community.org Git - koha.git/commit
Fixing some leftover conflict
authorChris Cormack <chris@bigballofwax.co.nz>
Tue, 15 Sep 2009 02:09:01 +0000 (14:09 +1200)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 16 Sep 2009 21:19:49 +0000 (23:19 +0200)
commit843b186c6b5743e694c47350c8ec8cfef28503e3
tree6fca28f15deea7829a46b1e291e0fbc2889989e8
parentb63fff5ba4f7ebffb4e40aab4fe014f7fd89c69f
Fixing some leftover conflict
koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl