pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting fix from rebase

Browse Source
This commit is contained in:
leigh-mil 2019-01-09 13:31:11 -05:00
parent eff797d21b
commit a9634edb95
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/routes/workspaces/test_projects.py
View File

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