resolving merge conflicts

1 files changed, 0 insertions, 23 deletions

diff --git a/app_expo/components/form-row/form-row.props.tsx b/app_expo/components/form-row/form-row.props.tsx
deleted file mode 100644
index 55b632e..0000000
--- a/app_expo/components/form-row/form-row.props.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as React from 'react'
-import { StyleProp, ViewStyle } from 'react-native'
-import { FormRowPresets } from './form-row.presets'
-
-/**
- * The properties you can pass to FormRow.
- */
-export interface FormRowProps {
-  /**
-   * Children components.
-   */
-  children?: React.ReactNode
-
-  /**
-   * Override the container style... useful for margins and padding.
-   */
-  style?: StyleProp<ViewStyle>
-
-  /**
-   * The type of border.
-   */
-  preset: FormRowPresets
-}