resolving merge conflicts

1 files changed, 0 insertions, 28 deletions

diff --git a/app_expo/components/text/text.tsx b/app_expo/components/text/text.tsx
deleted file mode 100644
index d9ffc8c..0000000
--- a/app_expo/components/text/text.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import * as React from 'react'
-import { Text as ReactNativeText } from 'react-native'
-import { presets } from './text.presets'
-import { TextProps } from './text.props'
-import { translate } from '../../i18n'
-
-/**
- * For your text displaying needs.
- *
- * This component is a HOC over the built-in React Native one.
- */
-export function Text(props: TextProps) {
-  // grab the props
-  const { preset = 'default', tx, txOptions, text, children, style: styleOverride, ...rest } = props
-
-  // figure out which content to use
-  const i18nText = tx && translate(tx, txOptions)
-  const content = i18nText || text || children
-
-  const style = presets[preset] || presets.default
-  const styles = [style, styleOverride]
-
-  return (
-    <ReactNativeText {...rest} style={styles}>
-      {content}
-    </ReactNativeText>
-  )
-}