http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9987
mathieu saby <mathieu.s...@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #7 from mathieu saby <mathieu.s...@univ-rennes2.fr> --- 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 -- 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/