From ca0264de48df008b81c9237d71e429f2a35a75f4 Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Wed, 26 Oct 2011 10:56:26 -0400 Subject: [PATCH] Removing merge conflict markers --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index cbd90bf380..169dfd1ea6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -779,12 +779,8 @@ No patron matched [% message %] [% previssue.itemtype %] [% previssue.displaydate %] -<<<<<<< HEAD - [% IF ( previssue.multiple_borrowers ) %][% previssue.borrowername %][% END %] -======= [% IF ( previssue.multiple_borrowers ) %][% previssue.firstname %] [% previssue.surname %][% END %] [% previssue.issuingbranchname %] ->>>>>>> 26acaf3... Bug 6801: checkoverdues returns unnecessary fields, causing slowness [% previssue.itemcallnumber %] [% previssue.charge %] [% previssue.replacementprice %]