resolving merge conflicts

1 files changed, 0 insertions, 30 deletions

diff --git a/app_expo/services/reactotron/reactotron-config.ts b/app_expo/services/reactotron/reactotron-config.ts
deleted file mode 100644
index 40e9c93..0000000
--- a/app_expo/services/reactotron/reactotron-config.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export interface ReactotronConfig {
-  /** The name of the app. */
-  name?: string
-  /** The host to connect to: default 'localhost'. */
-  host?: string
-  /** Should we use async storage */
-  useAsyncStorage?: boolean
-  /** Should we clear Reactotron when load? */
-  clearOnLoad?: boolean
-  /** Root state logging. */
-  state?: {
-    /** log the initial data that we put into the state on startup? */
-    initial?: boolean
-    /** log snapshot changes. */
-    snapshots?: boolean
-  }
-}
-
-/**
- * The default Reactotron configuration.
- */
-export const DEFAULT_REACTOTRON_CONFIG: ReactotronConfig = {
-  clearOnLoad: true,
-  host: 'localhost',
-  useAsyncStorage: true,
-  state: {
-    initial: true,
-    snapshots: false,
-  },
-}