Good catch, Santiago --- thanks!


On Sun, Feb 2, 2014 at 3:16 AM, SantiagoTorres <notifications@github.com>wrote:

> In tests/integration/test_extraneous_dependencies_attack.py:
>
> > @@ -236,6 +235,7 @@ def test_extraneous_dependency_attack(using_tuf=False, modify_metadata=False):
> >    test_extraneous_dependency_attack(using_tuf=True, modify_metadata=True)
> >
> >  except ExtraneousDependencyAlert, error:
> > +>>>>>>> develop
>
> The conflicts in this file were not properly managed.
>
> --
> Reply to this email directly or view it on GitHub<https://github.com/theupdateframework/tuf/pull/170/files#r9367390>
> .
>