frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts on update from upstream

Browse Source
This commit is contained in:
andrew.greene 2022-01-20 16:35:13 -07:00
parent e17cad1b33
commit 8060263523
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -6,7 +6,7 @@
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/andrewsgreene/not-node-red.git" "url": "https://github.com/defenseunicorns/Sparkles-Guide.git"
}, },
"private": "true", "private": "true",
"scripts": { "scripts": {
@ -77,8 +77,8 @@
"bcrypt": "5.0.1" "bcrypt": "5.0.1"
}, },
"devDependencies": { "devDependencies": {
"dompurify": "2.3.5",
"cypress": "^9.1.1", "cypress": "^9.1.1",
"dompurify": "2.3.5",
"grunt": "1.4.1", "grunt": "1.4.1",
"grunt-chmod": "~1.1.1", "grunt-chmod": "~1.1.1",
"grunt-cli": "~1.4.3", "grunt-cli": "~1.4.3",