resolving merge conflicts

1 files changed, 0 insertions, 19 deletions

diff --git a/app_expo/components/wallpaper/wallpaper.props.ts b/app_expo/components/wallpaper/wallpaper.props.ts
deleted file mode 100644
index 9d97f12..0000000
--- a/app_expo/components/wallpaper/wallpaper.props.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ImageStyle, StyleProp } from 'react-native'
-import { WallpaperPresets } from './wallpaper.presets'
-
-export interface WallpaperProps {
-  /**
-   * An optional style override useful for padding & margin.
-   */
-  style?: StyleProp<ImageStyle>
-
-  /**
-   * An optional background image to override the default image.
-   */
-  backgroundImage?: string
-
-  /**
-   * One of the different types of wallpaper presets.
-   */
-  preset?: WallpaperPresets
-}