From abc5371997e09b5b2231fc04d9aa8452519b0205 Mon Sep 17 00:00:00 2001
From: Vaughn Dice <vadice@microsoft.com>
Date: Tue, 8 Oct 2019 17:47:41 -0600
Subject: [PATCH] update brigade-utils dep

Signed-off-by: Vaughn Dice <vadice@microsoft.com>
---
 brigade.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/brigade.json b/brigade.json
index f403eaa1e..c5b27e47a 100644
--- a/brigade.json
+++ b/brigade.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< HEAD
   "dependencies": {
       "@brigadecore/brigade-utils": "0.3.0"
   }
-=======
-    "dependencies": {
-        "brigade-utils-test": "0.0.5"
-    }
->>>>>>> add brigade.json for brigade-utils/KindJob
 }
\ No newline at end of file