[Koha-bugs] [Bug 7162] Factorize code for order cancellation

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

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

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

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

--- Comment #54 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 7162:
<h1>Something went wrong !</h1>Applying: Bug 7162: Factorize code for order
cancellation
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Acquisition.pm
CONFLICT (content): Merge conflict in C4/Acquisition.pm
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 7162: Factorize code for order cancellation
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.
Bug 7162 - Factorize code for order cancellation

24075 - [SIGNED-OFF] Bug 7162: Factorize code for order cancellation
24076 - [SIGNED-OFF] Bug 7162 [Follow-up] Fix referrer URL when coming from
parcel.pl
24077 - Bug 7162; Factorize code for order cancellation (QA fixes)

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/SIGNED-OFF-Bug-7162-Factorize-code-for-order-cance-CAcZ3U.patch .

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