Resolve conflicts

1 files changed, 15 insertions, 1 deletions

diff --git a/src/server/api/models/poll-vote.ts b/src/server/api/models/poll-vote.ts
index c6638ccf1c..1cad95e5de 100644
--- a/src/server/api/models/poll-vote.ts
+++ b/src/server/api/models/poll-vote.ts
@@ -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;
+}