From f3dae0a11e5b9ab5b64ee313cba3101f9a3a6738 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Fri, 1 Nov 2024 12:18:46 -0700 Subject: [PATCH] Remove a merge conflict line --- src/registrar/views/portfolios.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py index 1741ad900..9f30d1112 100644 --- a/src/registrar/views/portfolios.py +++ b/src/registrar/views/portfolios.py @@ -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