Re: master broken

[Steve Salevan <steve@xxxxxxxxxx>]

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@xxxxxxxx> wrote:

Steve,

It looks like you accidentally merged an old branch (xs-delegation) 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@xxxxxxxx>

_______________________________________________
func mailing list
func@xxxxxxxxxxxxxxxxxxxxxx
https://lists.fedorahosted.org/mailman/listinfo/func

--

Steve Salevan

steve@xxxxxxxxxx

_______________________________________________
func mailing list
func@xxxxxxxxxxxxxxxxxxxxxx
https://lists.fedorahosted.org/mailman/listinfo/func