https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20119
Séverine Queune <severine.que...@bulac.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |severine.que...@bulac.fr
Status|Needs Signoff |Patch doesn't apply
--- Comment #9 from Séverine Queune <severine.que...@bulac.fr> ---
Applying: Bug 20119 - Ability to print claims for late orders
Using index info to reconstruct a base tree...
M C4/Letters.pm
M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
Auto-merging C4/Letters.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 20119 - Ability to print claims for late orders
The copy of the patch that failed is found in:
/var/repositories/koha/.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-20119---Ability-to-print-claims-for-late-order-II3tjp.patch
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
