[Koha-bugs] [Bug 25405] Make separation of Shibboleth and Local login clearer in modal login on OPAC

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25405

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #24 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 25405: clearly define local login and shib login sections
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
error: Failed to merge in the changes.


Can you please add the other bug (comment#21) in See also or as blocks?

-- 
You are receiving this mail because:
You are watching all bug changes.