resolving merge conflicts

1 files changed, 0 insertions, 31 deletions

diff --git a/app_expo/theme/typography.ts b/app_expo/theme/typography.ts
deleted file mode 100644
index 1695777..0000000
--- a/app_expo/theme/typography.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Platform } from 'react-native'
-
-/**
- * You can find a list of available fonts on both iOS and Android here:
- * https://github.com/react-native-training/react-native-fonts
- *
- * If you're interested in adding a custom font to your project,
- * check out the readme file in ./assets/fonts/ then come back here
- * and enter your new font name. Remember the Android font name
- * is probably different than iOS.
- * More on that here:
- * https://github.com/lendup/react-native-cross-platform-text
- *
- * The various styles of fonts are defined in the <Text /> component.
- */
-export const typography = {
-  /**
-   * The primary font.  Used in most places.
-   */
-  primary: Platform.select({ ios: 'Helvetica', android: 'normal' }),
-
-  /**
-   * An alternate font used for perhaps titles and stuff.
-   */
-  secondary: Platform.select({ ios: 'Arial', android: 'sans-serif' }),
-
-  /**
-   * Lets get fancy with a monospace font!
-   */
-  code: Platform.select({ ios: 'Courier', android: 'monospace' }),
-}