Chore: 병합오류 해결

WePlanPlans · Jan 4, 2024 · ec0ebab · ec0ebab
1 parent c852b42
commit ec0ebab
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 7 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/search/SearchInput.tsx b/src/components/search/SearchInput.tsx
@@ -1,6 +1,6 @@
-import { ReactComponent as CloseIcon } from '@assets/images/DeleteInput.svg';
-import { ReactComponent as LeftIcon } from '@assets/images/Left.svg';
-import { ReactComponent as SearchIcon } from '@assets/images/Search.svg';
+import { CloseIcon } from '@components/common/icons/Icons';
+import { LeftIcon } from '@components/common/icons/Icons';
+import { SearchIcon } from '@components/common/icons/Icons';
 import React, { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 

diff --git a/src/main.tsx b/src/main.tsx
@@ -2,9 +2,9 @@ import ReactDOM from 'react-dom/client';
 import App from './App.tsx';
 import './index.css';
 
-if (import.meta.env.DEV) {
-  const { worker } = await import('./mocks/browser.ts');
-  await worker.stop();
-}
+// if (import.meta.env.DEV) {
+//   const { worker } = await import('./mocks/browser.ts');
+//   await worker.stop();
+// }
 
 ReactDOM.createRoot(document.getElementById('root')!).render(<App />);