From 24eb93269fa1d2adc87c6b5bf89e2680fde2d084 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 11 Oct 2021 13:43:57 +0100
Subject: [PATCH] update components and setttings

---
 libs/remix-ui/vertical-icons-panel/.babelrc                   | 2 +-
 libs/remix-ui/vertical-icons-panel/.eslintrc.json             | 4 ++++
 .../src/lib/remix-ui-vertical-icons-panel.module.css          | 0
 .../vertical-icons-panel/types/vertical-icons-panel.d.ts      | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)
 delete mode 100644 libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.module.css

diff --git a/libs/remix-ui/vertical-icons-panel/.babelrc b/libs/remix-ui/vertical-icons-panel/.babelrc
index 09d67939cc..64a3748691 100644
--- a/libs/remix-ui/vertical-icons-panel/.babelrc
+++ b/libs/remix-ui/vertical-icons-panel/.babelrc
@@ -1,4 +1,4 @@
 {
   "presets": ["@nrwl/react/babel"],
   "plugins": []
-}
+}
\ No newline at end of file
diff --git a/libs/remix-ui/vertical-icons-panel/.eslintrc.json b/libs/remix-ui/vertical-icons-panel/.eslintrc.json
index 299346762b..056178bc85 100644
--- a/libs/remix-ui/vertical-icons-panel/.eslintrc.json
+++ b/libs/remix-ui/vertical-icons-panel/.eslintrc.json
@@ -16,4 +16,8 @@
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": "error"
   }
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> b6322066e (update components and setttings)
diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.module.css b/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.module.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/remix-ui/vertical-icons-panel/types/vertical-icons-panel.d.ts b/libs/remix-ui/vertical-icons-panel/types/vertical-icons-panel.d.ts
index 25dcc8fb65..f82e65cb32 100644
--- a/libs/remix-ui/vertical-icons-panel/types/vertical-icons-panel.d.ts
+++ b/libs/remix-ui/vertical-icons-panel/types/vertical-icons-panel.d.ts
@@ -79,7 +79,11 @@ export class VerticalIcons extends Plugin<any, any> {
    * Remove an icon from the map
    * @param {ModuleProfile} profile The profile of the module
    */
+<<<<<<< HEAD
   removeIcon({ name }: any): void
+=======
+  removeIcon({ kind, name }: any): void
+>>>>>>> b6322066e (update components and setttings)
   /**
    *  Remove active for the current activated icons
    */