https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8701 Hayley Mapley <hayleymapley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |hayleymapley@catalyst.net.n | |z --- Comment #10 from Hayley Mapley <hayleymapley@catalyst.net.nz> --- (In reply to Katrin Fischer from comment #9)

The system preference text has been fixed, there are only some occurences in dev type documentation now.

Hi Katrin, Should both patches be applied here? I have merge conflicts if that's the case. Applying: Bug 8701 - Help for OpacHiddenItems pref should not point to text in install directory Using index info to reconstruct a base tree... M installer/data/mysql/sysprefs.sql M installer/data/mysql/updatedatabase.pl M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 8701 - Help for OpacHiddenItems pref should not point to text in install directory Or should I only apply your patch? -- You are receiving this mail because: You are watching all bug changes.