From e83e1874e14d789ff676a1f7c117f60748c22367 Mon Sep 17 00:00:00 2001 From: Alan Roberts Date: Thu, 26 Sep 2024 19:48:10 -0400 Subject: [PATCH] fixing admin routes typo lines --- app/admin/routes.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/admin/routes.py b/app/admin/routes.py index 5887b34c..235eb1db 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -16,11 +16,7 @@ from app.activitypub.routes import process_inbox_request, process_delete_request from app.activitypub.signature import post_request, default_context from app.activitypub.util import instance_allowed, instance_blocked, extract_domain_and_actor from app.admin.forms import FederationForm, SiteMiscForm, SiteProfileForm, EditCommunityForm, EditUserForm, \ -<<<<<<< HEAD - EditTopicForm, SendNewsletterForm, AddUserForm, PreLoadCommunitiesForm, EditInstanceForm -======= EditTopicForm, SendNewsletterForm, AddUserForm, PreLoadCommunitiesForm, ImportExportBannedListsForm ->>>>>>> bc26e9f (Adding import, export for bans) from app.admin.util import unsubscribe_from_everything_then_delete, unsubscribe_from_community, send_newsletter, \ topics_for_form from app.community.util import save_icon_file, save_banner_file, search_for_community