fix: lint

eunji-0623 · Jun 15, 2024 · 4ab7416 · 4ab7416
1 parent b5d3701
commit 4ab7416
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/api/users/apiUsers.tsx b/src/api/users/apiUsers.tsx
@@ -39,19 +39,15 @@ export async function apiInquireMyInfo(): Promise<UserResponse> {
 
 // 내 정보 수정 api
 export async function apiEditMyInfo(
-  body: EditMyInfoBody
+  body: EditMyInfoBody,
 ): Promise<UserResponse> {
   const res = await instance.put<UserResponse>('/users/me', body);
   return handleResponse(res);
 }
 
 // 프로필 이미지 업로드 api
 export async function apiUploadImage(
-<<<<<<< HEAD
-  body: FormData // FormData로 받아오도록
-=======
   body: FormData,
->>>>>>> 9ca940bfde7c5cef0d3201940e2ebed752c92d74
 ): Promise<EditImageResponse> {
   const token = localStorage.getItem('Token'); // 저장된 토큰을 가져옴
   const res = await instance.post<EditImageResponse>('/users/me/image', body, {

diff --git a/src/pages/mypage/utils/useProfileChange.ts b/src/pages/mypage/utils/useProfileChange.ts
@@ -28,7 +28,7 @@ function useProfileChange() {
   const [nickname, setNickname] = useState('');
   const [profileImage, setProfileImage] = useState<File | null>(null);
   const [profileImageUrl, setProfileImageUrl] = useState<string | null>(
-    userInfo?.profileImageUrl || defaultProfileImg
+    userInfo?.profileImageUrl || defaultProfileImg,
   );
 
   // 모달 상태 관리