diff options
| -rw-r--r-- | package-lock.json | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/package-lock.json b/package-lock.json index 414b8abdc..e0e83d4b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2468,9 +2468,6 @@ "@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", -<<<<<<< HEAD - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" -======= "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, @@ -2483,7 +2480,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/D/-/D-1.0.0.tgz", "integrity": "sha512-nQvrCBu7K2pSSEtIM0EEF03FVjcczCXInMt3moLNFbjlWx6bZrX72uT6/1uAXDbnzGUAx9gTyDiQ+vrFi663oA==" ->>>>>>> master }, "abab": { "version": "2.0.6", @@ -5063,14 +5059,6 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", "dev": true }, -<<<<<<< HEAD - "D": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/D/-/D-1.0.0.tgz", - "integrity": "sha512-nQvrCBu7K2pSSEtIM0EEF03FVjcczCXInMt3moLNFbjlWx6bZrX72uT6/1uAXDbnzGUAx9gTyDiQ+vrFi663oA==" - }, -======= ->>>>>>> master "d3-array": { "version": "2.12.1", "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", @@ -7454,12 +7442,8 @@ "estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", -<<<<<<< HEAD - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" -======= "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true ->>>>>>> master } } }, @@ -9492,11 +9476,7 @@ "resolved": "https://registry.npmjs.org/image-size-stream/-/image-size-stream-1.1.0.tgz", "integrity": "sha1-Ivou2mbG31AQh0bacUkmSy0l+Gs=", "requires": { -<<<<<<< HEAD - "image-size": "git+https://github.com/netroy/image-size#da2c863807a3e9602617bdd357b0de3ab4a064c1", -======= "image-size": "github:netroy/image-size#da2c863807a3e9602617bdd357b0de3ab4a064c1", ->>>>>>> master "readable-stream": "^1.0.33", "tryit": "^1.0.1" }, @@ -12491,8 +12471,6 @@ "write-file-atomic": "^2.4.3" }, "dependencies": { -<<<<<<< HEAD -======= "JSONStream": { "version": "1.3.5", "bundled": true, @@ -12501,7 +12479,6 @@ "through": ">=2.2.7 <3" } }, ->>>>>>> master "abbrev": { "version": "1.1.1", "resolved": false, @@ -15361,8 +15338,6 @@ } } }, -<<<<<<< HEAD -======= "string_decoder": { "version": "1.3.0", "bundled": true, @@ -15376,7 +15351,6 @@ } } }, ->>>>>>> master "stringify-package": { "version": "1.0.1", "resolved": false, |