From 9023c0b49fd59e83f096a1c4ba1a188d09cbaa0c Mon Sep 17 00:00:00 2001
From: = <david.aparicio@dhis2.org>
Date: Wed, 27 Sep 2023 11:00:15 +0200
Subject: [PATCH] update: [ANDROAPP-5467] Conflicts resolved

---
 common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt
index 5f3d93ed3..f2b2efcf4 100644
--- a/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt
+++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt
@@ -23,7 +23,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import org.hisp.dhis.common.screens.BadgesScreen
 import org.hisp.dhis.common.screens.BottomSheetHeaderScreen
-import org.hisp.dhis.common.screens.BottomSheetScreen
 import org.hisp.dhis.common.screens.ButtonBlockScreen
 import org.hisp.dhis.common.screens.ButtonScreen
 import org.hisp.dhis.common.screens.CheckboxScreen
@@ -32,7 +31,6 @@ import org.hisp.dhis.common.screens.Components
 import org.hisp.dhis.common.screens.FormShellsScreen
 import org.hisp.dhis.common.screens.FormsComponentsScreen
 import org.hisp.dhis.common.screens.IconButtonScreen
-import org.hisp.dhis.common.screens.IconCardsScreen
 import org.hisp.dhis.common.screens.InputAgeScreen
 import org.hisp.dhis.common.screens.InputIntegerScreen
 import org.hisp.dhis.common.screens.InputLetterScreen
@@ -127,7 +125,6 @@ fun Main() {
             Components.LEGEND_DESCRIPTION -> LegendDescriptionScreen()
             Components.FORM_SHELLS -> FormShellsScreen()
             Components.BUTTON_BLOCK -> ButtonBlockScreen()
-            Components.ICON_CARDS -> IconCardsScreen()
             Components.BOTTOM_SHEET_HEADER -> BottomSheetHeaderScreen()
             Components.TAGS -> TagsScreen()
             Components.SECTIONS -> SectionScreen()
@@ -143,6 +140,7 @@ fun Main() {
             Components.BADGES -> BadgesScreen()
             Components.SWITCH -> SwitchScreen()
             Components.INPUT_RADIO_BUTTON -> InputRadioButtonScreen()
+            Components.METADATA_AVATAR -> MetadataAvatarScreen()
         }
     }
 }