resolving merge conflicts

1 files changed, 0 insertions, 37 deletions

diff --git a/app_expo/components/text/text.props.ts b/app_expo/components/text/text.props.ts
deleted file mode 100644
index 79ee12c..0000000
--- a/app_expo/components/text/text.props.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { StyleProp, TextProps as TextProperties, TextStyle } from 'react-native'
-import i18n from 'i18n-js'
-import { TextPresets } from './text.presets'
-import { TxKeyPath } from '../../i18n'
-
-export interface TextProps extends TextProperties {
-  /**
-   * Children components.
-   */
-  children?: React.ReactNode
-
-  /**
-   * Text which is looked up via i18n.
-   */
-  tx?: TxKeyPath
-
-  /**
-   * Optional options to pass to i18n. Useful for interpolation
-   * as well as explicitly setting locale or translation fallbacks.
-   */
-  txOptions?: i18n.TranslateOptions
-
-  /**
-   * The text to display if not using `tx` or nested components.
-   */
-  text?: string
-
-  /**
-   * An optional style override useful for padding & margin.
-   */
-  style?: StyleProp<TextStyle>
-
-  /**
-   * One of the different types of text presets.
-   */
-  preset?: TextPresets
-}