[Koha-bugs] [Bug 5872] Enhancements to circulation management

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

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

Christophe Croullebois <christophe.croullebois at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
       Patch Status|Needs Signoff               |Does not apply

--- Comment #12 from Christophe Croullebois <christophe.croullebois at biblibre.com> 2011-04-04 13:34:13 UTC ---
christophe at christophe-desktop:~/Workspace/koha3.2$ git am -3
Patch/0001-Bug-5872-Circulation-management-enhancements.patch
Applying: Bug 5872 : Circulation management enhancements
Using index info to reconstruct a base tree...
<stdin>:75: trailing whitespace.

<stdin>:83: trailing whitespace.
    );    
<stdin>:97: trailing whitespace.
    my $itype = (C4::Context->preference('item-level_itypes')) 
<stdin>:212: trailing whitespace.
                    } else { 
<stdin>:213: trailing whitespace.
                        $count_query .= " JOIN  biblioitems USING
(biblionumber) 
warning: squelched 77 whitespace errors
warning: 82 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
Auto-merging C4/Overdues.pm
Auto-merging C4/Reserves.pm
Auto-merging admin/branch_transfer_limits.pl
Auto-merging admin/smart-rules.pl
CONFLICT (content): Merge conflict in admin/smart-rules.pl
Auto-merging circ/branchtransfers.pl
Auto-merging circ/circulation.pl
CONFLICT (content): Merge conflict in circ/circulation.pl
Auto-merging circ/returns.pl
CONFLICT (content): Merge conflict in circ/returns.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
Auto-merging members/member.pl
Auto-merging reserve/request.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 5872 : Circulation management enhancements

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.