From 5eae515bc73573081ed32286c7a40fea5b83268f Mon Sep 17 00:00:00 2001
From: Rob Fletcher <robfletcher@users.noreply.github.com>
Date: Wed, 6 Mar 2019 14:44:37 -0800
Subject: [PATCH] new Kork with conflict fix (#319)

---
 src/spinnaker-dependencies.template | 2 +-
 src/spinnaker-dependencies.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/spinnaker-dependencies.template b/src/spinnaker-dependencies.template
index fb9f754..f1717f3 100644
--- a/src/spinnaker-dependencies.template
+++ b/src/spinnaker-dependencies.template
@@ -1,7 +1,7 @@
 versions:
 # spinnaker libs
   fiat: "0.54.1"
-  kork: "4.0.0-rc.5-springBoot2"
+  kork: "4.0.0-rc.6-springBoot2"
   scheduledActions: "0.39.0"
   clouddriver: "2.114.4"
   front50: "1.139.0"
diff --git a/src/spinnaker-dependencies.yml b/src/spinnaker-dependencies.yml
index 8199c46..f07c4d6 100644
--- a/src/spinnaker-dependencies.yml
+++ b/src/spinnaker-dependencies.yml
@@ -1,7 +1,7 @@
 versions:
 # spinnaker libs
   fiat: "0.54.1"
-  kork: "4.0.0-rc.5-springBoot2"
+  kork: "4.0.0-rc.6-springBoot2"
   scheduledActions: "0.39.0"
   clouddriver: "2.114.4"
   front50: "1.139.0"