Follow up patch, removing missed conflict marker
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 16 Jun 2010 04:42:14 +0000 (16:42 +1200)
committerGalen Charlton <gmcharlt@gmail.com>
Sat, 19 Jun 2010 11:23:50 +0000 (07:23 -0400)
commitac5047b8872768168db3182eca2a1a4fb7de2d5e
tree2c36a1bfaf48977edd86e87186357f18ed22f730
parentb3feb54ee073b99565a4e25fd397ff6ed5a0dc78
Follow up patch, removing missed conflict marker

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc