resolving merge conflicts

1 files changed, 0 insertions, 41 deletions

diff --git a/app_expo/components/bullet-item/bullet-item.tsx b/app_expo/components/bullet-item/bullet-item.tsx
deleted file mode 100644
index f6b2f17..0000000
--- a/app_expo/components/bullet-item/bullet-item.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import * as React from 'react'
-import { View, ViewStyle, ImageStyle, TextStyle } from 'react-native'
-import { Text } from '../text/text'
-import { Icon } from '../icon/icon'
-import { spacing, typography } from '../../theme'
-
-const BULLET_ITEM: ViewStyle = {
-  flexDirection: 'row',
-  marginTop: spacing[4],
-  paddingBottom: spacing[4],
-  borderBottomWidth: 1,
-  borderBottomColor: '#3A3048',
-}
-const BULLET_CONTAINER: ViewStyle = {
-  marginRight: spacing[4] - 1,
-  marginTop: spacing[2],
-}
-const BULLET: ImageStyle = {
-  width: 8,
-  height: 8,
-}
-const BULLET_TEXT: TextStyle = {
-  flex: 1,
-  fontFamily: typography.primary,
-  color: '#BAB6C8',
-  fontSize: 15,
-  lineHeight: 22,
-}
-
-export interface BulletItemProps {
-  text: string
-}
-
-export function BulletItem(props: BulletItemProps) {
-  return (
-    <View style={BULLET_ITEM}>
-      <Icon icon="bullet" containerStyle={BULLET_CONTAINER} style={BULLET} />
-      <Text style={BULLET_TEXT} text={props.text} />
-    </View>
-  )
-}