fix: conflict files

kedar-hargude · kedar-hargude · commit a8f0d1367ab0 · 2023-06-29T08:06:53.000+05:30
diff --git a/src/components/Tabs/Tabs.module.scss b/src/components/Tabs/Tabs.module.scss
@@ -1,11 +1,8 @@
 $theme-grey: #d4d4d5;
-<<<<<<< HEAD
 $theme-grey-light: #f1f1f5;
 $gray-shade-color: #808080;
 $gray-shade-color2: #5c5b5b;
-=======
 $theme-dark-grey: #a1a5b7;
->>>>>>> e03a416 (refactor: create variable name for colours)
 $theme-pink: #e30062;
 
 .tabButton {
