[Koha-bugs] [Bug 21946] Group circulation by item type

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21946

Lisette Scheer <lisetteslatah at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #94 from Lisette Scheer <lisetteslatah at gmail.com> ---
Applying: Bug 21946: Database updates
Applying: Bug 21946: Update C4::Circulation->TooMany to check parent itemtypes
.git/rebase-apply/patch:95: trailing whitespace.
            } else {
.git/rebase-apply/patch:96: trailing whitespace.
                $count_query .= " JOIN  biblioitems USING (biblionumber)
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       t/db_dependent/Circulation/TooMany.t
.git/rebase-apply/patch:95: trailing whitespace.
            } else {
.git/rebase-apply/patch:96: trailing whitespace.
                $count_query .= " JOIN  biblioitems USING (biblionumber)
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Circulation/TooMany.t
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 21946: Update C4::Circulation->TooMany to check parent
itemtypes
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-21946-Update-C4Circulation-TooMany-to-check-pa-mluqOe.patch

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