[Koha-bugs] [Bug 25090] Enable library approval of OPAC self registrations before a patron account is created

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |david at davidnind.com

--- Comment #26 from David Nind <david at davidnind.com> ---
Patches no longer apply 8-(..

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 25090: OPAC Template changes
Using index info to reconstruct a base tree...
M      
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 25090: OPAC Template changes
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-25090-OPAC-Template-changes-ueOCKF.patch

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