[Koha-bugs] [Bug 10988] Allow login via Google OAuth2

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10988

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de
             Status|Signed Off                  |Patch doesn't apply

--- Comment #43 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch does not apply - please rebase!

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 10988: Allow login via Google OAuth2
Using index info to reconstruct a base tree...
M       C4/Auth.pm
M       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
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
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging C4/Auth.pm
CONFLICT (content): Merge conflict in C4/Auth.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 10988: Allow login via Google OAuth2
The copy of the patch that failed is found in:
   /home/katrin/kohaclone/.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-10988-Allow-login-via-Google-OAuth2-fFUW8a.patch

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