From 44fbda929028b3984beda56d2edbb7d3384acb9a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 12 Oct 2023 11:18:03 +0100
Subject: [PATCH] Fixing conflict.

---
 packages/server/package.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 9e26b20e0a..8b19ca0894 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -18,13 +18,7 @@
     "test": "bash scripts/test.sh",
     "test:memory": "jest --maxWorkers=2 --logHeapUsage --forceExit",
     "test:watch": "jest --watch",
-<<<<<<< HEAD
     "build:docker": "yarn build && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
-    "build:docs": "node ./scripts/docs/generate.js open",
-=======
-    "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client && yarn build && cp ../../yarn.lock ./dist/",
-    "build:docker": "yarn predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
->>>>>>> c762d8727f69b3154eb14429b0842f3d0f62ad76
     "run:docker": "node dist/index.js",
     "run:docker:cluster": "pm2-runtime start pm2.config.js",
     "dev:stack:up": "node scripts/dev/manage.js up",