From 2f742d4bafe24104e2dde422d534a360082ad674 Mon Sep 17 00:00:00 2001
From: yupix <yupi0982@outlook.jp>
Date: Sun, 2 Jun 2024 14:43:02 +0000
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B6=88=E3=81=97=E5=BF=98=E3=82=8C?=
 =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/admin/moderation.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index c5c9103516..47db14513a 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -98,9 +98,7 @@ const preservedUsernames = ref<string>('');
 const tosUrl = ref<string | null>(null);
 const privacyPolicyUrl = ref<string | null>(null);
 const trustedLinkUrlPatterns = ref<string>('');
-=======
 const inquiryUrl = ref<string | null>(null);
->>>>>>> upstream/develop
 
 async function init() {
 	const meta = await misskeyApi('admin/meta');