From c2ca788611948cd9998131a1ed1b950b42c4e81b Mon Sep 17 00:00:00 2001
From: KANGYONGSU23 <edc20203@gmail.com>
Date: Tue, 28 Nov 2023 10:24:55 +0900
Subject: [PATCH] =?UTF-8?q?fix=20::=20conflict=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/user/index.ts                   |  4 ++--
 src/components/SuggestionHeader.tsx      |  6 +-----
 src/components/common/Header.tsx         |  6 +-----
 src/components/common/SearchDropDown.tsx |  8 +-------
 src/components/company/CompanyTitle.tsx  | 12 +-----------
 5 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/apis/user/index.ts b/src/apis/user/index.ts
index f3ec23a..3342bd0 100644
--- a/src/apis/user/index.ts
+++ b/src/apis/user/index.ts
@@ -1,9 +1,9 @@
-import { useToastStore, Toast } from "@team-return/design-system";
 import { useMutation } from "@tanstack/react-query";
+import { useToastStore } from "@team-return/design-system";
+import axios, { AxiosError } from "axios";
 import { useRouter } from "next/navigation";
 import { useCookies } from "react-cookie";
 import { RequestBody, ResponseBody } from "./type";
-import axios, { AxiosError } from "axios";
 
 const router = "/users";
 
diff --git a/src/components/SuggestionHeader.tsx b/src/components/SuggestionHeader.tsx
index a1cb12e..5a677f4 100644
--- a/src/components/SuggestionHeader.tsx
+++ b/src/components/SuggestionHeader.tsx
@@ -9,11 +9,7 @@ interface PropsType {
 }
 
 export default function SuggestionHeader({ listType }: PropsType) {
-<<<<<<< HEAD
-  const { data: profile } = MyProfile();
-=======
-  const { data } = useMyProfile();
->>>>>>> develop
+  const { data: profile } = useMyProfile();
 
   const suggestionHeaderDummy = {
     Company: {
diff --git a/src/components/common/Header.tsx b/src/components/common/Header.tsx
index 21578d2..b944a07 100644
--- a/src/components/common/Header.tsx
+++ b/src/components/common/Header.tsx
@@ -14,11 +14,7 @@ function Header() {
     return null;
   }
 
-<<<<<<< HEAD
-  const { data: profile } = MyProfile();
-=======
-  const profile = useMyProfile();
->>>>>>> develop
+  const { data: profile } = useMyProfile();
 
   return (
     <div
diff --git a/src/components/common/SearchDropDown.tsx b/src/components/common/SearchDropDown.tsx
index 68e3efe..ecab39a 100644
--- a/src/components/common/SearchDropDown.tsx
+++ b/src/components/common/SearchDropDown.tsx
@@ -3,17 +3,11 @@
 import { useGetCode } from "@/apis/code";
 import { useDropDown } from "@/hook/useDropDown";
 import useForm from "@/hook/useForm";
-<<<<<<< HEAD
-import Chips from "./Chips";
-import { GetCode } from "@/apis/code";
-import { TechCodeResponensType } from "@/util/type/type";
-=======
 import { RecruitmentsQueryType } from "@/hook/useQueryString/type";
 import { useQueryString } from "@/hook/useQueryString/useQueryString";
-import { TechCodeResponensType } from "@/util/type";
+import { TechCodeResponensType } from "@/util/type/type";
 import { Icon } from "@team-return/design-system";
 import React, { useEffect, useState } from "react";
->>>>>>> develop
 import GhostBtn from "./Button/GhostBtn";
 import Chips from "./Chips";
 import TextFiled from "./TextFiled";
diff --git a/src/components/company/CompanyTitle.tsx b/src/components/company/CompanyTitle.tsx
index ae5a1fd..1baf113 100644
--- a/src/components/company/CompanyTitle.tsx
+++ b/src/components/company/CompanyTitle.tsx
@@ -1,15 +1,9 @@
 "use client";
 
-<<<<<<< HEAD
 import { getCompanyKebabItems } from "@/util/object/kebabMenuItems";
 import { KebabItemType } from "@/util/type/kebabMenu";
 import Image from "next/image";
 import KebabMenu from "../common/Dropdown/KebabMenu";
-=======
-import { useDropDown } from "@/hook/useDropDown";
-import { Icon } from "@team-return/design-system";
-import Image from "next/image";
->>>>>>> develop
 
 interface PropsType {
   business_number?: string;
@@ -28,14 +22,10 @@ export default function CompanyTitle({
   onClickInterview,
   children,
 }: PropsType) {
-<<<<<<< HEAD
-  const kebabItems = getCompanyKebabItems(
+  const kebabItems: KebabItemType[] = getCompanyKebabItems(
     onClickRecruitments,
     onClickInterview
   );
-=======
-  const { DropDownComponent, toggleDropdown, closeDropDown } = useDropDown();
->>>>>>> develop
 
   return (
     <div className="flex items-center justify-between w-full">