Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/server/api/models/poll-vote.ts
View file

@ -1,3 +1,17 @@
<<<<<<< HEAD:src/server/api/models/poll-vote.ts
import db from '../../../db/mongodb';
=======
import * as mongo from 'mongodb';
import db from '../../db/mongodb';
>>>>>>> refs/remotes/origin/master:src/api/models/poll-vote.ts
export default db.get('poll_votes') as any; // fuck type definition
const PollVote = db.get<IPollVote>('pollVotes');
export default PollVote;
export interface IPollVote {
_id: mongo.ObjectID;
createdAt: Date;
userId: mongo.ObjectID;
postId: mongo.ObjectID;
choice: number;
}