From bfc193d8cd9aecdb82d585e8b4e101deac60a5bb Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 29 Mar 2018 14:48:47 +0900 Subject: Resolve conflicts --- src/server/web/docs/api/entities/drive-file.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/web/docs/api/entities/drive-file.yaml') diff --git a/src/server/web/docs/api/entities/drive-file.yaml b/src/server/web/docs/api/entities/drive-file.yaml index 2ebbb089ab..02ab0d608e 100644 --- a/src/server/web/docs/api/entities/drive-file.yaml +++ b/src/server/web/docs/api/entities/drive-file.yaml @@ -11,13 +11,13 @@ props: desc: ja: "ファイルID" en: "The ID of this file" - - name: "created_at" + - name: "createdAt" type: "date" optional: false desc: ja: "アップロード日時" en: "The upload date of this file" - - name: "user_id" + - name: "userId" type: "id(User)" optional: false desc: @@ -59,7 +59,7 @@ props: desc: ja: "ファイルのURL" en: "The URL of this file" - - name: "folder_id" + - name: "folderId" type: "id(DriveFolder)" optional: true desc: -- cgit v1.2.3-freya