update brigade-utils dep

Signed-off-by: Vaughn Dice <[email protected]>
brigadecore · Oct 28, 2019 · abc5371 · abc5371
1 parent 35d1ac2
commit abc5371
Showing 1 changed file with 0 additions and 6 deletions.
diff --git 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
 }