toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix incorrect merge

Browse source
This commit is contained in:
Harrison Healey 2019-06-05 11:25:54 -04:00
parent 5ff98e8a86
commit 8d2b2b09d9
1 changed files with 0 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
package-lock.json generated
View file

@ -7669,12 +7669,8 @@
"ansi-regex": {
"version": "2.1.1",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"optional": true
=======
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
>>>>>>> master
},
"aproba": {
"version": "1.2.0",
@ -7695,12 +7691,8 @@
"balanced-match": {
"version": "1.0.0",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"optional": true
=======
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
>>>>>>> master
},
"brace-expansion": {
"version": "1.1.11",
@ -7720,32 +7712,20 @@
"code-point-at": {
"version": "1.1.0",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"optional": true
=======
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
>>>>>>> master
},
"concat-map": {
"version": "0.0.1",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"optional": true
=======
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
>>>>>>> master
},
"console-control-strings": {
"version": "1.1.0",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"optional": true
=======
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
>>>>>>> master
},
"core-util-is": {
"version": "1.0.2",
@ -7862,12 +7842,8 @@
"inherits": {
"version": "2.0.3",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"optional": true
=======
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
>>>>>>> master
},
"ini": {
"version": "1.3.5",
@ -7900,12 +7876,8 @@
"minimist": {
"version": "0.0.8",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"optional": true
=======
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
>>>>>>> master
},
"minipass": {
"version": "2.3.5",
@ -8009,12 +7981,8 @@
"number-is-nan": {
"version": "1.0.1",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"optional": true
=======
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
>>>>>>> master
},
"object-assign": {
"version": "4.1.1",
@ -8111,12 +8079,8 @@
"safe-buffer": {
"version": "5.1.2",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"optional": true
=======
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
>>>>>>> master
},
"safer-buffer": {
"version": "2.1.2",
@ -8214,22 +8178,14 @@
"wrappy": {
"version": "1.0.2",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"optional": true
=======
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
>>>>>>> master
},
"yallist": {
"version": "3.0.3",
"resolved": false,
<<<<<<< HEAD
"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
"optional": true
=======
"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
>>>>>>> master
}
}
},