Resolve conflicts

2018-03-29 14:48:47 +09:00 · 2018-03-29 14:48:47 +09:00 · bfc193d8cd
commit bfc193d8cd
parent 281b388e39
308 changed files with 3045 additions and 3200 deletions
--- a/src/server/api/endpoints/othello/invitations.ts
+++ b/src/server/api/endpoints/othello/invitations.ts
@ -3,7 +3,7 @@ import Matching, { pack as packMatching } from '../../models/othello-matching';
 module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Find session
 	const invitations = await Matching.find({
-		child_id: user._id
+		childId: user._id
 	}, {
 		sort: {
 			_id: -1