https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23376
Agustín Moyano <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #4 from Agustín Moyano <[email protected]> --- When I try to apply this, I get the following 13:47 $ git bz apply 23376 Bug 23376 - Cleanup order receive page 91774 - Bug 23376: Clean up order recipt page 91857 - Bug 23376: Move AcqCreateItem logic to template 91858 - Bug 23376: Remove unneeded 'count' parameter Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 23376: Clean up order recipt page Using index info to reconstruct a base tree... M acqui/orderreceive.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt Auto-merging acqui/orderreceive.pl CONFLICT (content): Merge conflict in acqui/orderreceive.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 23376: Clean up order recipt page hint: Use 'git am --show-current-patch' 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 /var/folders/97/nr6_vjn53dl2csvdgtcy_8f40000gp/T/Bug-23376-Clean-up-order-recipt-page-Q2iLmH.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
