https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24023 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #10 from Séverine Queune <severine.queune@bulac.fr> --- Hi Julian, I got these conflicts trying to apply the patch. Would be happy to test it next week if you can fix it ! 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/modules/catalogue/detail.tt 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 CONFLICT (content): Merge conflict in catalogue/detail.pl Auto-merging admin/columns_settings.yml Auto-merging C4/Items.pm Auto-merging C4/Biblio.pm CONFLICT (content): Merge conflict in C4/Biblio.pm Failed to merge in the changes. Patch failed at 0001 Bug 24023: Add ability to create bundles of items -- You are receiving this mail because: You are watching all bug changes.