resolving merge conflicts

1 files changed, 0 insertions, 13 deletions

diff --git a/app_expo/components/form-row/form-row.tsx b/app_expo/components/form-row/form-row.tsx
deleted file mode 100644
index c6453bc..0000000
--- a/app_expo/components/form-row/form-row.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as React from 'react'
-import { View } from 'react-native'
-import { PRESETS } from './form-row.presets'
-import { FormRowProps } from './form-row.props'
-
-/**
- * A horizontal container component used to hold a row of a form.
- */
-export function FormRow(props: FormRowProps) {
-  const viewStyle = [PRESETS[props.preset], props.style]
-
-  return <View style={viewStyle}>{props.children}</View>
-}