https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27634 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #32 from David Nind <david@davidnind.com> --- The patches no longer apply 8-(.. git bz apply 27634 Bug 27634 - Turn off patron self-registration if no default category is set 147531 - Bug 27634: Turn off patron self-registration if no default category is set 147532 - Bug 27634: Force include categorycode to PatronSelfRegistrationBorrowerUnwantedField 147533 - Bug 27634: Add the ability to exclude fields from "modal" sysprefs 147534 - Bug 27634: Force include of dateexpiry 147535 - Bug 27634: Add a warning to the about page if PatronSelfRegistrationDefaultCategory not set 147536 - Bug 27634: Update PatronSelfRegistrationBorrowerUnwantedField's value 147537 - Bug 27634: Hide "Register here" links Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 27634: Turn off patron self-registration if no default category is set Applying: Bug 27634: Force include categorycode to PatronSelfRegistrationBorrowerUnwantedField Applying: Bug 27634: Add the ability to exclude fields from "modal" sysprefs Applying: Bug 27634: Force include of dateexpiry Applying: Bug 27634: Add a warning to the about page if PatronSelfRegistrationDefaultCategory not set Using index info to reconstruct a base tree... M about.pl M koha-tmpl/intranet-tmpl/prog/en/modules/about.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/about.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/about.tt Auto-merging about.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 27634: Add a warning to the about page if PatronSelfRegistrationDefaultCategory not set -- You are receiving this mail because: You are watching all bug changes.