zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-23 19:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove a merge conflict line

Browse source
This commit is contained in:
Rebecca Hsieh 2024-11-01 12:18:46 -07:00
parent fb635f746f
commit f3dae0a11e
No known key found for this signature in database
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/registrar/views/portfolios.py
View file

@ -15,7 +15,6 @@ from registrar.forms.portfolio import (
)
from registrar.forms import portfolio as portfolioForms
>>>>>>> edfc67649d6b2021e972bfa9fd4cad9f78a57e06
from registrar.models import Portfolio, User
from registrar.models.portfolio_invitation import PortfolioInvitation
from registrar.models.user_portfolio_permission import UserPortfolioPermission