master broken

Steve Salevan steve at tumblr.com
Fri Feb 8 18:14:10 UTC 2013


Hey man,
Thanks hugely for discovering this; I have corrected the merge conflict and
pushed a commit up to master to unbreak Func.

On Fri, Feb 8, 2013 at 12:55 PM, S.Çağlar Onur <caglar at 10ur.org> wrote:

> Steve,
>
> It looks like you accidentally merged an old branch (xs-delegation<http://git.fedorahosted.org/cgit/func.git/commit/>) into
> master [1] and it made things bad as commit contains non python code.
>
> [1]
> http://git.fedorahosted.org/cgit/func.git/commit/?id=9a0ae4446ff1b9ad7bccc57ddfb3c765fa68ebbf
>
> Cheers,
> --
> S.Çağlar Onur <caglar at 10ur.org>
>
> _______________________________________________
> func mailing list
> func at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/func
>
--
Steve Salevan
steve at tumblr.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.fedorahosted.org/pipermail/func/attachments/20130208/e69f5962/attachment.html>


More information about the func mailing list