[Koha-bugs] [Bug 22393] Remove last remaining manualinvoice use

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

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

Victor Grousset/tuxayo <victor at tuxayo.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |victor at tuxayo.net

--- Comment #16 from Victor Grousset/tuxayo <victor at tuxayo.net> ---
Doesn't apply:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 22393: Remove last remaining use of C4::Accounts::manualinvoice
Using index info to reconstruct a base tree...
M       members/maninvoice.pl
Falling back to patching base and 3-way merge...
Auto-merging members/maninvoice.pl
CONFLICT (content): Merge conflict in members/maninvoice.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 22393: Remove last remaining use of
C4::Accounts::manualinvoice
hint: Use 'git am --show-current-patch=diff' to see the failed 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-22393-Remove-last-remaining-use-of-C4Accountsm-8xPypt.patch

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