fix: Merge code error

mvc-labs · Mar 12, 2024 · 92fc187 · 92fc187
1 parent 7f77f85
commit 92fc187
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/src/pages/wallet/Asset.vue b/src/pages/wallet/Asset.vue
@@ -267,19 +267,11 @@ const toReceive = () => {
   @apply w-[119px] h-12 rounded-3xl flex items-center justify-center gap-x-2;
 }
 
-<<<<<<< HEAD
 .btn-blue-light {
   @apply btn bg-blue-light text-blue-primary;
 }
 
 .btn-blue-primary {
-=======
-.blue-light-btn {
-  @apply btn bg-blue-light text-blue-primary;
-}
-
-.blue-primary-btn {
->>>>>>> 91c8393a46fc535d308c052698e4cd45f194b6fa
   @apply btn bg-blue-primary text-white;
 }
 

diff --git a/src/router.ts b/src/router.ts
@@ -361,7 +361,6 @@ const routes = [
     },
   },
   {
-<<<<<<< HEAD
     path: '/settings/toolkit/btc-merge',
     component: () => import('./pages/settings/components/BTCMerge.vue'),
     meta: {
@@ -371,8 +370,6 @@ const routes = [
     },
   },
   {
-=======
->>>>>>> 91c8393a46fc535d308c052698e4cd45f194b6fa
     path: '/settings/toolkit/space-merge',
     component: () => import('./pages/settings/components/SpaceMerge.vue'),
     meta: {

diff --git a/tailwind.config.cjs b/tailwind.config.cjs
@@ -61,6 +61,7 @@ module.exports = {
       padding: {
         7.5: '1.875rem',
         22.5: '5.625rem',
+      },
       keyframes: {
         'accordion-down': {
           from: { height: 0 },