From 1eb216ace34a417b606ac04005b36b8aebfb06d8 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Tue, 9 Feb 2021 16:03:45 +0000
Subject: [PATCH] Fix conflict in yarn lock

---
 packages/builder/yarn.lock | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index fa94386f00..c95e2da250 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -842,17 +842,11 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-<<<<<<< HEAD
 "@budibase/bbui@^1.58.4":
   version "1.58.4"
   resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.58.4.tgz#a74d66b3dd715b0a9861a0f86bc0b863fd8f1d44"
   integrity sha512-1oEVt7zMREM594CAUIXqOtiuP4Sx4FbfgPBHTZ+t4RhFfbFqvU7yyakqPZM2LhTAmO5Rfa+c+dfFLh+y1++KaA==
-=======
-"@budibase/bbui@^1.58.3":
-  version "1.58.3"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.58.3.tgz#86ad6aa68eec7426e1ccdf1f7e7fc957cb57d3a3"
-  integrity sha512-PpbxfBhVpmP0EO1nPBhrz486EHCIgtJlXELC/ElzjG+FCQZSCvDSM7mq/97FOW35iYdTiQTlwFgOtvOgT1P8IQ==
->>>>>>> 10f6d871354dace180c86aefb389a97f7925b902
+
   dependencies:
     markdown-it "^12.0.2"
     quill "^1.3.7"