[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

Lisette Scheer <lisetteslatah at gmail.com> changed:

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

--- Comment #19 from Lisette Scheer <lisetteslatah at gmail.com> ---
Applying: Bug 25090: OPAC Template changes
Using index info to reconstruct a base tree...
M      
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
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
Auto-merging
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 25090: OPAC Template changes
The copy of the patch that failed is found in: .git/rebase-apply/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-8TeDF2.patch

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