resolving merge conflicts

2 files changed, 0 insertions, 27 deletions

diff --git a/app_expo/models/character/character.test.ts b/app_expo/models/character/character.test.ts
deleted file mode 100644
index d7bfac7..0000000
--- a/app_expo/models/character/character.test.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { CharacterModel } from './character'
-
-test('can be created', () => {
-  const instance = CharacterModel.create({
-    id: 1,
-    name: 'Rick Sanchez',
-  })
-
-  expect(instance).toBeTruthy()
-})
diff --git a/app_expo/models/character/character.ts b/app_expo/models/character/character.ts
deleted file mode 100644
index 4405338..0000000
--- a/app_expo/models/character/character.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Instance, SnapshotOut, types } from 'mobx-state-tree'
-
-/**
- * Rick and Morty character model.
- */
-export const CharacterModel = types.model('Character').props({
-  id: types.identifierNumber,
-  name: types.maybe(types.string),
-  status: types.maybe(types.string),
-  image: types.maybe(types.string),
-})
-
-type CharacterType = Instance<typeof CharacterModel>
-export interface Character extends CharacterType {}
-type CharacterSnapshotType = SnapshotOut<typeof CharacterModel>
-export interface CharacterSnapshot extends CharacterSnapshotType {}
-export const createCharacterDefaultModel = () => types.optional(CharacterModel, {})