From 8060263523c492c392c7b53716c921975b10d387 Mon Sep 17 00:00:00 2001 From: "andrew.greene" Date: Thu, 20 Jan 2022 16:35:13 -0700 Subject: [PATCH] Resolve merge conflicts on update from upstream --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fe525feef..67a4e2f1a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/andrewsgreene/not-node-red.git" + "url": "https://github.com/defenseunicorns/Sparkles-Guide.git" }, "private": "true", "scripts": { @@ -77,8 +77,8 @@ "bcrypt": "5.0.1" }, "devDependencies": { - "dompurify": "2.3.5", "cypress": "^9.1.1", + "dompurify": "2.3.5", "grunt": "1.4.1", "grunt-chmod": "~1.1.1", "grunt-cli": "~1.4.3",