resolving merge conflicts

1 files changed, 0 insertions, 19 deletions

diff --git a/app_expo/components/icon/icon.tsx b/app_expo/components/icon/icon.tsx
deleted file mode 100644
index f596bb2..0000000
--- a/app_expo/components/icon/icon.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import * as React from 'react'
-import { View, ImageStyle } from 'react-native'
-import { AutoImage as Image } from '../auto-image/auto-image'
-import { IconProps } from './icon.props'
-import { icons } from './icons'
-
-const ROOT: ImageStyle = {
-  resizeMode: 'contain',
-}
-
-export function Icon(props: IconProps) {
-  const { style: styleOverride, icon, containerStyle } = props
-
-  return (
-    <View style={containerStyle}>
-      <Image style={[ROOT, styleOverride]} source={icons[icon]} />
-    </View>
-  )
-}