resolving merge conflicts

1 files changed, 0 insertions, 44 deletions

diff --git a/app_expo/components/checkbox/checkbox.props.ts b/app_expo/components/checkbox/checkbox.props.ts
deleted file mode 100644
index 4a212e3..0000000
--- a/app_expo/components/checkbox/checkbox.props.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { StyleProp, ViewStyle } from 'react-native'
-import { TxKeyPath } from '../../i18n'
-
-export interface CheckboxProps {
-  /**
-   * Additional container style. Useful for margins.
-   */
-  style?: StyleProp<ViewStyle>
-
-  /**
-   * Additional outline style.
-   */
-  outlineStyle?: StyleProp<ViewStyle>
-
-  /**
-   * Additional fill style. Only visible when checked.
-   */
-  fillStyle?: StyleProp<ViewStyle>
-
-  /**
-   * Is the checkbox checked?
-   */
-  value?: boolean
-
-  /**
-   * The text to display if there isn't a tx.
-   */
-  text?: string
-
-  /**
-   * The i18n lookup key.
-   */
-  tx?: TxKeyPath
-
-  /**
-   * Multiline or clipped single line?
-   */
-  multiline?: boolean
-
-  /**
-   * Fires when the user tabs to change the value.
-   */
-  onToggle?: (newValue: boolean) => void
-}