]> git.koha-community.org Git - koha.git/commit
Removing merge conflict markers
authorChris Nighswonger <chris.nighswonger@gmail.com>
Wed, 26 Oct 2011 14:56:26 +0000 (10:56 -0400)
committerChris Nighswonger <chris.nighswonger@gmail.com>
Wed, 26 Oct 2011 14:56:26 +0000 (10:56 -0400)
commitca0264de48df008b81c9237d71e429f2a35a75f4
treee0a9e31fa8e1b54b28b8ccc34856275544fdd54c
parentc9fc4d92f175f1d39d6d059453eab7be1c1ae308
Removing merge conflict markers
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt