resolving merge conflicts

1 files changed, 0 insertions, 34 deletions

diff --git a/app_expo/components/wallpaper/wallpaper.presets.ts b/app_expo/components/wallpaper/wallpaper.presets.ts
deleted file mode 100644
index 148ad5c..0000000
--- a/app_expo/components/wallpaper/wallpaper.presets.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { ImageStyle } from 'react-native'
-
-/**
- * All wallpaper will start off looking like this.
- */
-const BASE: ImageStyle = {
-  position: 'absolute',
-  top: 0,
-  left: 0,
-  bottom: 0,
-  right: 0,
-}
-
-/**
- * All the variations of wallpaper styling within the app.
- *
- * You want to customize these to whatever you need in your app.
- */
-export const presets = {
-  /**
-   * The default wallpaper styles.
-   */
-  stretch: {
-    ...BASE,
-    resizeMode: 'stretch',
-    width: null, // Have to set these to null because android ¯\_(ツ)_/¯
-    height: null,
-  } as ImageStyle,
-}
-
-/**
- * A list of preset names.
- */
-export type WallpaperPresets = keyof typeof presets