From a9634edb95e33596d3c2facac78cac54def261fa Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Wed, 9 Jan 2019 13:31:11 -0500 Subject: [PATCH] Formatting fix from rebase --- tests/routes/workspaces/test_projects.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/routes/workspaces/test_projects.py b/tests/routes/workspaces/test_projects.py index 7d8f5ae7..a442e9fb 100644 --- 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