Formatting fix from rebase

2019-01-09 13:31:11 -05:00 · 2019-01-09 13:31:11 -05:00 · a9634edb95
commit a9634edb95
parent eff797d21b
1 changed files with 1 additions and 4 deletions
--- a/tests/routes/workspaces/test_projects.py
+++ b/tests/routes/workspaces/test_projects.py
@ -1,6 +1,5 @@
 from flask import url_for

-<<<<<<< HEAD
 from tests.factories import (
    UserFactory,
    WorkspaceFactory,
@ -9,9 +8,7 @@ from tests.factories import (
    EnvironmentFactory,
    ProjectFactory,
 )
-=======
-from tests.factories import UserFactory, WorkspaceFactory, WorkspaceRoleFactory
->>>>>>> Add tests
+
 from atst.domain.projects import Projects
 from atst.domain.workspaces import Workspaces
 from atst.domain.roles import Roles