https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12663 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #26 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Please rebase! Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 12663 - SCOUserCSS and SCOUserJS ignored on selfcheck login page Using index info to reconstruct a base tree... M C4/Auth.pm M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt Auto-merging C4/Auth.pm Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.