merge conflict

src/registrar/migrations/0138_merge_20241114_2101.py

@@ -0,0 +1,13 @@
+# Generated by Django 4.2.10 on 2024-11-14 21:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0137_alter_domaininvitation_status"),
+        ("registrar", "0137_suborganization_city_suborganization_state_territory"),
+    ]
+
+    operations = []

src/registrar/views/domain.py

@@ -2,7 +2,7 @@
 
 Authorization is handled by the `DomainPermissionView`. To ensure that only
 authorized users can see information on a domain, every view here should
-inherit from `DomainPermissionView` (or DomainInvitationPermissionDeleteView).
+inherit from `DomainPermissionView`.
 """
 
 from datetime import date

src/registrar/views/utility/__init__.py

@@ -5,7 +5,6 @@ from .permission_views import (
     DomainPermissionView,
     DomainRequestPermissionView,
     DomainRequestPermissionWithdrawView,
-    DomainInvitationPermissionDeleteView,
     DomainRequestWizardPermissionView,
     PortfolioMembersPermission,
     DomainRequestPortfolioViewonlyView,