OK!


On Sun, Feb 10, 2013 at 6:29 PM, Gilles Lenfant <notifications@github.com>wrote:

> In mrbob/cli.py:
>
> > @@ -83,15 +94,12 @@ def main(args=sys.argv[1:]):
> >          global_config = parse_config(userconfig)
> >          global_bobconfig = global_config['mr.bob']
> >          global_variables = global_config['variables']
> > -        global_defaults = global_config['defaults']
>
> I didn't remove this. You (or someone else on your repo) added this after
> my fork if I recall correctly. I'll make a "git fetch upstream" + "git
> merge upstream/master", fix the conflicts if any and commit / push again.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/iElectric/mr.bob/pull/39/files#r2955580>..
>
>