https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8137
Philip Orr <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #139 from Philip Orr <[email protected]> --- Patch doesn't seem to apply: Applying: Bug 8137: Add 'global checkout limits' table Using index info to reconstruct a base tree... M Koha/CirculationRules.pm M Koha/Template/Plugin/CirculationRules.pm M admin/smart-rules.pl M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Auto-merging installer/data/mysql/kohastructure.sql Auto-merging admin/smart-rules.pl CONFLICT (content): Merge conflict in admin/smart-rules.pl Auto-merging Koha/Template/Plugin/CirculationRules.pm Auto-merging Koha/CirculationRules.pm CONFLICT (content): Merge conflict in Koha/CirculationRules.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 8137: Add 'global checkout limits' table I'm happy to try and signoff after the conflict is resolved. -- 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/
