Fix bad merge from master

780203dd · Clement Ho · 84f0e1c9 · 780203dd
Commit 780203dd authored May 08, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

app/assets/javascripts/deploy_keys/components/action_btn.vue app/assets/javascripts/deploy_keys/components/action_btn.vue +4 -0

No files found.
--- a/app/assets/javascripts/deploy_keys/components/action_btn.vue
+++ b/app/assets/javascripts/deploy_keys/components/action_btn.vue
@@ -11,6 +11,10 @@ export default {
      type: Object,
      required: true,
    },
+    type: {
+      type: String,
+      required: true,
+    },
    btnCssClass: {
      type: String,
      required: false,