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/auth/session/show.ts
+++ b/src/server/api/endpoints/auth/session/show.ts
@ -23,17 +23,17 @@ import AuthSess, { pack } from '../../../models/auth-session';
 *         schema:
 *           type: object
 *           properties:
- *             created_at:
+ *             createdAt:
 *               type: string
 *               format: date-time
 *               description: Date and time of the session creation
- *             app_id:
+ *             appId:
 *               type: string
 *               description: Application ID
 *             token:
 *               type: string
 *               description: Session Token
- *             user_id:
+ *             userId:
 *               type: string
 *               description: ID of user who create the session
 *             app: