diff --git a/package-lock.json b/package-lock.json index 78f9a58..d499c69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index 6e4aefa..6cbfbb1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sineql", - "version": "1.0.1", + "version": "1.0.2", "description": "A simple to use graphQL clone", "main": "source/index.js", "scripts": {