https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35906
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |[email protected] --- Comment #44 from David Nind <[email protected]> --- The patch no longer applies 8-(... git bz apply 35906 Bug 35906 - Add bookable option on itemtypes 164579 - Bug 35906: Add bookable option on itemtype 164580 - Bug 35906: Add unit test 164581 - Bug 35906: Remove preference and add override handling 164582 - Bug 35906: Schema dump 164583 - Bug 35906: (QA follow-up) Fix item-type schema 165437 - Bug 35906: (follow-up) rebased it Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35906: Add bookable option on itemtype Using index info to reconstruct a base tree... M Koha/Items.pm M Koha/REST/V1/Biblios.pm M installer/data/mysql/kohastructure.sql M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging installer/data/mysql/kohastructure.sql Auto-merging Koha/REST/V1/Biblios.pm CONFLICT (content): Merge conflict in Koha/REST/V1/Biblios.pm Auto-merging Koha/Items.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 35906: Add bookable option on itemtype -- 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/
