summaryrefslogtreecommitdiff
path: root/src/server/api/models/meta.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
commitbfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch)
tree8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/api/models/meta.ts
parentresolve conflict (diff)
downloadsharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/api/models/meta.ts')
-rw-r--r--src/server/api/models/meta.ts5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/api/models/meta.ts b/src/server/api/models/meta.ts
index ee1ada18fa..cad7f5096e 100644
--- a/src/server/api/models/meta.ts
+++ b/src/server/api/models/meta.ts
@@ -1,7 +1,8 @@
import db from '../../../db/mongodb';
-export default db.get('meta') as any; // fuck type definition
+const Meta = db.get<IMeta>('meta');
+export default Meta;
export type IMeta = {
- top_image: string;
+ broadcasts: any[];
};