http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9987 --- Comment #8 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #7)
I have this error when I try to apply 17184
Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging C4/Acquisition.pm Failed to merge in the changes. Patch failed at 0001 Bug 9987: Remove DB field aqorders.biblioitemnunmber When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".
M. Saby
Mathieu, It is a conflict on updatedatabase.pl, it is really easy to fix for testing (edit the file, merge conflict, git add /path/to/updatedatabase.pl, git am --resolved). -- You are receiving this mail because: You are watching all bug changes.