From 780203dd7337d74e2ac651cdbb012c1c5d8c5375 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Tue, 8 May 2018 14:34:02 -0500
Subject: [PATCH] Fix bad merge from master

---
 app/assets/javascripts/deploy_keys/components/action_btn.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/deploy_keys/components/action_btn.vue b/app/assets/javascripts/deploy_keys/components/action_btn.vue
index bdb0cc4efb7..42ab0b67d11 100644
--- 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,