From 71ac81e8c9f8f88e9fe6940edf2eefaf3ecd615e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 31 Aug 2021 13:12:32 +0100
Subject: [PATCH] updating dep

---
 packages/string-templates/package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index af7a760b75..3f9254fc15 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@budibase/string-templates",
-<<<<<<< HEAD
-  "version": "0.9.116-alpha.3",
-=======
   "version": "0.9.116",
->>>>>>> 7cddd772fd1122f791af443bc4a3c4ca1eef288d
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",