From 3e6780b4132eb97d73b5a7c6c1a3ba982cc49114 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Mon, 21 Jul 2025 12:01:31 +0800
Subject: [PATCH] no message

---
 src/app/(main)/user/page.tsx         |  2 +-
 src/app/api/settings/item/actions.ts | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/app/(main)/user/page.tsx b/src/app/(main)/user/page.tsx
index 272d5a1..1aeaa19 100644
--- a/src/app/(main)/user/page.tsx
+++ b/src/app/(main)/user/page.tsx
@@ -12,7 +12,7 @@ export const metadata: Metadata = {
 };
 
 const TaskTemplates: React.FC = async () => {
-  const { t } = await getServerI18n("user");
+  const { t } = await getServerI18n("common");
 
   return (
     <>
diff --git a/src/app/api/settings/item/actions.ts b/src/app/api/settings/item/actions.ts
index 2cd37bb..0ca7f4b 100644
--- a/src/app/api/settings/item/actions.ts
+++ b/src/app/api/settings/item/actions.ts
@@ -37,7 +37,6 @@ export type CreateItemInputs = {
 };
 
 export const saveItem = async (data: CreateItemInputs) => {
-<<<<<<< HEAD
     // try {
       const item = await serverFetchJson<CreateItemResponse<CreateItemInputs>>(`${BASE_API_URL}/items/new`, {
         method: "POST",
@@ -47,17 +46,3 @@ export const saveItem = async (data: CreateItemInputs) => {
       revalidateTag("items");
       return item
     };
-=======
-  // try {
-  const item = await serverFetchJson<CreateItemResponse<CreateItemInputs>>(
-    `${BASE_API_URL}/items/new`,
-    {
-      method: "POST",
-      body: JSON.stringify(data),
-      headers: { "Content-Type": "application/json" },
-    },
-  );
-  revalidateTag("items");
-  return item;
-};
->>>>>>> 5c6e25f78f79bd44c563ec67c6ec9d59f2a7baed