fix(FE) : conflict 해결

softeerbootcamp · Feb 20, 2023 · de17e7d · de17e7d
1 parent 24160f0
commit de17e7d
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/client/src/components/common/header.js b/client/src/components/common/header.js
@@ -98,20 +98,12 @@ const header = (props) => {
       $.el,
       (fragment) => $.prepend(fragment, $.qs('#root')),
       handleEvent);
-<<<<<<< HEAD
 
     // color === 'mint' && _.go(
     //   sideMenu(),
     //   () => $.qs('.trigger'),
     //   $.on('click', openMenuEvent));
   }
-=======
-  // () => sideMenu()(),
-  // () => $.qs('.trigger'));
-  // $.on('click', openMenuEvent));
-  // () => modal("로그아웃", "logout")());
->>>>>>> 137215d (feat(FE) : firebase 링크 추가(#164))
-
   return appendHeader;
 };