[Koha-bugs] [Bug 32658] Use template wrapper in order from staged file template

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #5 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Please rebase! 

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 32658: Use template wrapper in order from staged file template
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 32658: Use template wrapper in order from staged file
template
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-32658-Use-template-wrapper-in-order-from-stage-3QNVu8.patch

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