resolve conflicts

1 files changed, 0 insertions, 29 deletions

diff --git a/src/env/components/AppNavigation/sila.js b/src/env/components/AppNavigation/sila.js
index 09093d6b..4056a0d0 100644
--- a/src/env/components/AppNavigation/sila.js
+++ b/src/env/components/AppNavigation/sila.js
@@ -1,32 +1,10 @@
-import IconDashboard from '@carbon/icons-vue/es/dashboard/16';
-import IconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16';
-import IconDataCheck from '@carbon/icons-vue/es/data--check/16';
-import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16';
-import IconSettings from '@carbon/icons-vue/es/settings/16';
-import IconSecurity from '@carbon/icons-vue/es/security/16';
-import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16';
-import IconDataBase from '@carbon/icons-vue/es/data--base--alt/16';
-import IconChip from '@carbon/icons-vue/es/chip/16';
-
 const AppNavigationMixin = {
-  components: {
-    iconOverview: IconDashboard,
-    iconLogs: IconTextLinkAnalysis,
-    iconHealth: IconDataCheck,
-    iconControl: IconSettingsAdjust,
-    iconSettings: IconSettings,
-    iconSecurityAndAccess: IconSecurity,
-    iconExpand: IconChevronUp,
-    iconResourceManagement: IconDataBase,
-    iconChip: IconChip,
-  },
   data() {
     return {
       navigationItems: [
         {
           id: 'overview',
           label: this.$t('appNavigation.system'),
-          icon: 'iconOverview',
           children: [
             {
               id: 'overview',
@@ -53,7 +31,6 @@ const AppNavigationMixin = {
         {
           id: 'logs',
           label: this.$t('appNavigation.logs'),
-          icon: 'iconLogs',
           children: [
             {
               id: 'event-logs',
@@ -70,7 +47,6 @@ const AppNavigationMixin = {
         {
           id: 'hardware-status',
           label: this.$t('appNavigation.hardwareStatus'),
-          icon: 'iconHealth',
           children: [
             {
               id: 'sensors',
@@ -93,7 +69,6 @@ const AppNavigationMixin = {
         {
           id: 'operations',
           label: this.$t('appNavigation.operations'),
-          icon: 'iconControl',
           children: [
             {
               id: 'factory-reset',
@@ -140,7 +115,6 @@ const AppNavigationMixin = {
         {
           id: 'processors',
           label: this.$t('appNavigation.processors'),
-          icon: 'iconChip',
           children: [
             {
               id: 'processors/dynamic',
@@ -152,7 +126,6 @@ const AppNavigationMixin = {
         {
           id: 'settings',
           label: this.$t('appNavigation.settings'),
-          icon: 'iconSettings',
           children: [
             {
               id: 'power-restore-policy',
@@ -164,7 +137,6 @@ const AppNavigationMixin = {
         {
           id: 'security-and-access',
           label: this.$t('appNavigation.securityAndAccess'),
-          icon: 'iconSecurityAndAccess',
           children: [
             {
               id: 'sessions',
@@ -196,7 +168,6 @@ const AppNavigationMixin = {
         {
           id: 'resource-management',
           label: this.$t('appNavigation.resourceManagement'),
-          icon: 'iconResourceManagement',
           children: [
             {
               id: 'power',