gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing merge conflict markers

This commit is contained in:
Chris Nighswonger 2011-10-26 10:56:26 -04:00
parent c9fc4d92f1
commit ca0264de48
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
View File

@ -779,12 +779,8 @@ No patron matched <span class="ex">[% message %]</span>
[% previssue.itemtype %]
</td>
<td>[% previssue.displaydate %]</td>
<<<<<<< HEAD
[% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.borrowername %]</td>[% END %]
=======
[% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.firstname %] [% previssue.surname %]</td>[% END %]
<td>[% previssue.issuingbranchname %]</td>
>>>>>>> 26acaf3... Bug 6801: checkoverdues returns unnecessary fields, causing slowness
<td>[% previssue.itemcallnumber %]</td>
<td>[% previssue.charge %]</td>
<td>[% previssue.replacementprice %]</td>