https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24023
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #16 from Séverine Queune <[email protected]> --- Argh... Sorry Julian... Falling back to patching base and 3-way merge... Auto-merging tools/inventory.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging circ/returns.pl Auto-merging catalogue/detail.pl Auto-merging admin/columns_settings.yml Auto-merging C4/Items.pm Auto-merging C4/Biblio.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 24023: Add ability to create bundles of items The copy of the patch that failed is found in: .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-24023-Add-ability-to-create-bundles-of-items-nCjUy1.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/
