https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20930
Michal Denar <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #22 from Michal Denar <[email protected]> --- Ho Owen, can You rebase this patch on master? Applying: Bug 20930: Dump and load system preferences of YAML/JSON type Using index info to reconstruct a base tree... M C4/Context.pm M Koha/Config/SysPref.pm M Koha/Exceptions/Config.pm M t/db_dependent/Context.t Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Bug 20930: First example - Change OpacHiddenItems to type YAML Using index info to reconstruct a base tree... M C4/Biblio.pm M C4/Items.pm M installer/data/mysql/sysprefs.sql M opac/opac-search.pl M t/db_dependent/Items.t Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Bug 20930: Display human readable errors in preferences page Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt M koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js M svc/config/systempreferences Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt error: Failed to merge in the changes. -- 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/
