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

Séverine Queune <severine.que...@bulac.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |severine.que...@bulac.fr
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #13 from Séverine Queune <severine.que...@bulac.fr> ---

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 12502 - Add vendor and internal note to late orders page
Using index info to reconstruct a base tree...
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
Failed to merge in the changes.
Patch failed at 0001 Bug 12502 - Add vendor and internal note to late orders
page
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-12502---Add-vendor-and-internal-note-to-late-o-KaZRtc.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/

Reply via email to