Resolve conflicts

2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
--- a/src/server/api/endpoints/othello/match/cancel.ts
+++ b/src/server/api/endpoints/othello/match/cancel.ts
@@ -2,7 +2,7 @@ import Matching from '../../../models/othello-matching';

 module.exports = (params, user) => new Promise(async (res, rej) => {
 	await Matching.remove({
-		parent_id: user._id
+		parentId: user._id
 	});

 	res();