From 221748232909a9aa414c92aeb7883e818c70b7a3 Mon Sep 17 00:00:00 2001
From: Carlos Alcaide <me@calcaide.com>
Date: Wed, 14 Jul 2021 07:59:15 -0700
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Adding=20credential=20st?=
 =?UTF-8?q?ore=20edit=20form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add credential-store mirage config. Add edit credential store form. Add
credential store route. Add credential store template.
---
 ui/admin/app/components/form/credential-store/index.hbs        | 3 +++
 .../scope/credential-stores/credential-store/-header.hbs       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/admin/app/components/form/credential-store/index.hbs b/ui/admin/app/components/form/credential-store/index.hbs
index f972854c1..446ac598a 100644
--- a/ui/admin/app/components/form/credential-store/index.hbs
+++ b/ui/admin/app/components/form/credential-store/index.hbs
@@ -1,6 +1,9 @@
 <Rose::Form
   @onSubmit={{@submit}}
+<<<<<<< HEAD
   @cancel={{@cancel}}
+=======
+>>>>>>> 9bf653f8 (feat: 🎸 Adding credential store edit form)
   @disabled={{@model.isSaving}}
   @showEditToggle={{if @model.isNew false true}}
   as |form|
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
index 0ff5c81bc..c3db9fd05 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
@@ -6,4 +6,4 @@
   @acknowledgeText={{t 'states.copied'}}
 >
   <code>{{@model.id}}</code>
-</Copyable>
\ No newline at end of file
+</Copyable>