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/dev/views/app.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/web/app/dev/views/app.vue')

diff --git a/src/server/web/app/dev/views/app.vue b/src/server/web/app/dev/views/app.vue
index 2c2a3c83ce..a35b032b73 100644
--- a/src/server/web/app/dev/views/app.vue
+++ b/src/server/web/app/dev/views/app.vue
@@ -28,7 +28,7 @@ export default Vue.extend({
 		fetch() {
 			this.fetching = true;
 			(this as any).api('app/show', {
-				app_id: this.$route.params.id
+				appId: this.$route.params.id
 			}).then(app => {
 				this.app = app;
 				this.fetching = false;
-- 
cgit v1.2.3-freya

