From 9504afcaa99450abd6f3d05135f68c6c1cb1f412 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 22 Dec 2023 12:22:09 -0700
Subject: [PATCH] Remove merge conflict

---
 src/registrar/admin.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index b428546c9..253934a3a 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -772,13 +772,6 @@ class DomainApplicationAdmin(ListHeaderAdmin):
 
     filter_horizontal = ("current_websites", "alternative_domains", "other_contacts")
     
-    # lists in filter_horizontal are not sorted properly, sort them
-    # by website
-    def formfield_for_manytomany(self, db_field, request, **kwargs):
-        if db_field.name in ("current_websites", "alternative_domains"):
-            kwargs["queryset"] = models.Website.objects.all().order_by("website")  # Sort websites
-        return super().formfield_for_manytomany(db_field, request, **kwargs)
-
     # Trigger action when a fieldset is changed
     def save_model(self, request, obj, form, change):
         if obj and obj.creator.status != models.User.RESTRICTED: