From bfc193d8cd9aecdb82d585e8b4e101deac60a5bb Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 29 Mar 2018 14:48:47 +0900
Subject: Resolve conflicts

---
 src/server/web/app/common/views/widgets/slideshow.vue | 2 +-
 src/server/web/app/common/views/widgets/version.vue   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/server/web/app/common/views/widgets')

diff --git a/src/server/web/app/common/views/widgets/slideshow.vue b/src/server/web/app/common/views/widgets/slideshow.vue
index e9451663e2..ad32299f37 100644
--- a/src/server/web/app/common/views/widgets/slideshow.vue
+++ b/src/server/web/app/common/views/widgets/slideshow.vue
@@ -97,7 +97,7 @@ export default define({
 			this.fetching = true;
 
 			(this as any).api('drive/files', {
-				folder_id: this.props.folder,
+				folderId: this.props.folder,
 				type: 'image/*',
 				limit: 100
 			}).then(images => {
diff --git a/src/server/web/app/common/views/widgets/version.vue b/src/server/web/app/common/views/widgets/version.vue
index 5072d9b74a..30b632b396 100644
--- a/src/server/web/app/common/views/widgets/version.vue
+++ b/src/server/web/app/common/views/widgets/version.vue
@@ -1,16 +1,17 @@
 <template>
-<p>ver {{ v }} (葵 aoi)</p>
+<p>ver {{ version }} ({{ codename }})</p>
 </template>
 
 <script lang="ts">
-import { version } from '../../../config';
+import { version, codename } from '../../../config';
 import define from '../../../common/define-widget';
 export default define({
 	name: 'version'
 }).extend({
 	data() {
 		return {
-			v: version
+			version,
+			codename
 		};
 	}
 });
-- 
cgit v1.2.3-freya