summaryrefslogtreecommitdiff
path: root/src/server/web/app/dev/views/app.vue
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
commitbfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch)
tree8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/web/app/dev/views/app.vue
parentresolve conflict (diff)
downloadsharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/web/app/dev/views/app.vue')
-rw-r--r--src/server/web/app/dev/views/app.vue2
1 files changed, 1 insertions, 1 deletions
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;