[Koha-bugs] [Bug 21479] Removing from cart removes 2 items

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

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

--- Comment #7 from David Nind <david at davidnind.com> ---
Able to see the problem now - was using cart itself to remove items, rather
than adding and removing from the search result list.

Getting this message when trying to apply patch (git bz apply 21479):

Applying: Bug 21479: Fix remove from cart - OPAC
Applying: Bug 21479: (alternate) Removing from cart removes 2 items
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 21479: (alternate) Removing from cart removes 2 items
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-21479-alternate-Removing-from-cart-removes-2-i-Fk_Tok.patch

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