Ratstail91/sineQL
1
0
Fork 0
mirror of https://github.com/Ratstail91/sineQL.git synced 2025-11-29 02:34:28 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict artefacts

Browse Source
This commit is contained in:
Kayne Ruse
2022-06-29 02:03:39 +01:00
parent 7fbb0d2eb6
commit 366ac10ca0
2 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
package-lock.json generated
View File

@@ -1,20 +1,12 @@
{
"name": "sineql",
<<<<<<< HEAD
"version": "1.0.0",
=======
"version": "1.0.1",
>>>>>>> origin/main
"version": "1.0.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "sineql",
<<<<<<< HEAD
"version": "1.0.0",
=======
"version": "1.0.1",
>>>>>>> origin/main
"version": "1.0.2",
"license": "ISC",
"devDependencies": {
"jest": "^27.5.1"
@@ -3061,15 +3053,6 @@
"node": "*"
}
},
<<<<<<< HEAD
=======
"node_modules/minimist": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
"dev": true
},
>>>>>>> origin/main
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -6398,15 +6381,6 @@
"brace-expansion": "^1.1.7"
}
},
<<<<<<< HEAD
=======
"minimist": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
"dev": true
},
>>>>>>> origin/main
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",