https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=37570
Philip Orr <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #2 from Philip Orr <[email protected]> --- Doesn't seem to apply on ktd: Applying: Bug 37570: Add SearchAlsoIn syspref Using index info to reconstruct a base tree... M catalogue/search.pl M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt M opac/opac-search.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-search.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/mandatory/sysprefs.sql Auto-merging catalogue/search.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 37570: Add SearchAlsoIn syspref -- 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/
