http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14111
Indranil Das Gupta <indr...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |indr...@gmail.com
--- Comment #6 from Indranil Das Gupta <indr...@gmail.com> ---
(In reply to Bernardo Gonzalez Kriegel from comment #5)
> A problem here...
>
> git bz apply 14111
> Bug 14111 - Silence warnings t/Auth_with_shibboleth.t
>
> 38832 - Bug 14111 - More t/Auth_with_shibboleth.t silencing
> 39227 - Bug 14111: Silence warnings in t/Auth_with_shibboleth.t
>
> Apply? [(y)es, (n)o, (i)nteractive] y
> Applying: Bug 14111 - More t/Auth_with_shibboleth.t silencing
> fatal: sha1 information is lacking or useless (t/Auth_with_shibboleth.t).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
Bernardo:
I believe I goofed up there! :-( that mess is quite likely my creation. I'm
trying to git-revert. But no success so far.
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
