resolving merge conflicts

1 files changed, 0 insertions, 20 deletions

diff --git a/app_expo/models/root-store/root-store.ts b/app_expo/models/root-store/root-store.ts
deleted file mode 100644
index 56425bc..0000000
--- a/app_expo/models/root-store/root-store.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Instance, SnapshotOut, types } from 'mobx-state-tree'
-import { CharacterStoreModel } from '../character-store/character-store'
-
-/**
- * A RootStore model.
- */
-// prettier-ignore
-export const RootStoreModel = types.model("RootStore").props({
-  characterStore: types.optional(CharacterStoreModel, {} as any),
-})
-
-/**
- * The RootStore instance.
- */
-export interface RootStore extends Instance<typeof RootStoreModel> {}
-
-/**
- * The data of a RootStore.
- */
-export interface RootStoreSnapshot extends SnapshotOut<typeof RootStoreModel> {}