🐛 merge conlict 처리

team-nabi · Nov 1, 2023 · 80ed5d6 · 80ed5d6
1 parent 77120bf
commit 80ed5d6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/config/assets.ts b/src/config/assets.ts
@@ -1,17 +1,17 @@
 import AlarmIcon from '/public/images/bell.svg'
 import GoogleIcon from '/public/images/google.png'
+import LeftIcon from '/public/images/icon-left.svg'
+import RightIcon from '/public/images/icon-right.svg'
 import KakaoIcon from '/public/images/kakao.png'
 import Logo from '/public/images/logo.svg'
 import MenuIcon from '/public/images/menu-icon.svg'
-import LeftIcon from '/public/images/icon-left.svg'
-import RightIcon from '/public/images/icon-right.svg'
 import XIcon from '/public/images/x-icon.svg'
 
 const Assets = {
   menuIcon: MenuIcon,
   alarmIcon: AlarmIcon,
   leftIcon: LeftIcon,
-  rightIcon: RightIcon
+  rightIcon: RightIcon,
   googleIcon: GoogleIcon,
   kakaoIcon: KakaoIcon,
   logo: Logo,