[Koha-bugs] [Bug 14668] Show serial enumeration in the checkin page and the patron's opac checkout summary

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14668

Aleisha Amohia <aleishaamohia at hotmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |aleishaamohia at hotmail.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #3 from Aleisha Amohia <aleishaamohia at hotmail.com> ---
Applying: Bug 14668 - Show serial enumeration in the checkin page and the
patron's opac checkout summary
/home/vagrant/kohaclone/.git/rebase-apply/patch:139: trailing whitespace.
                                <a
href="/cgi-bin/koha/reserve/request.pl?biblionumber=[%
WaitingReserveLoo.biblionumber %]">[% WaitingReserveLoo.title | html %]</a> 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:139: trailing whitespace.
                                <a
href="/cgi-bin/koha/reserve/request.pl?biblionumber=[%
WaitingReserveLoo.biblionumber %]">[% WaitingReserveLoo.title | html %]</a> 
warning: 1 line applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging svc/checkouts
CONFLICT (content): Merge conflict in svc/checkouts
Auto-merging opac/opac-user.pl
CONFLICT (content): Merge conflict in opac/opac-user.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
Auto-merging circ/returns.pl
CONFLICT (content): Merge conflict in circ/returns.pl
Auto-merging circ/circulation.pl
CONFLICT (content): Merge conflict in circ/circulation.pl
Auto-merging C4/Reserves.pm

-- 
You are receiving this mail because:
You are watching all bug changes.