External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 14:39:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

removing shrinkwrap to avoid merge conflict for now

Browse Source
This commit is contained in:
Jared Tabor
2016-09-19 14:40:38 -07:00
parent a4f134b772
commit 541f55fece
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/npm-shrinkwrap.json generated
View File

@@ -2837,15 +2837,6 @@
}, },
"istanbul-lib-coverage": { "istanbul-lib-coverage": {
"version": "1.0.0", "version": "1.0.0",
<<<<<<< 09aef3eb4366affa87873a3722971ca537d105a9
"from": "istanbul-lib-coverage@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz"
},
"istanbul-lib-instrument": {
"version": "1.1.3",
"from": "istanbul-lib-instrument@>=1.1.1 <2.0.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.1.3.tgz"
=======
"from": "istanbul-lib-coverage@>=1.0.0-alpha.4 <2.0.0", "from": "istanbul-lib-coverage@>=1.0.0-alpha.4 <2.0.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz" "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz"
}, },
@@ -2853,7 +2844,6 @@
"version": "1.1.1", "version": "1.1.1",
"from": "istanbul-lib-instrument@>=1.1.1 <2.0.0", "from": "istanbul-lib-instrument@>=1.1.1 <2.0.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.1.1.tgz" "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.1.1.tgz"
>>>>>>> Fix schedules sitewide (#3469)
}, },
"javascript-detect-element-resize": { "javascript-detect-element-resize": {
"version": "0.5.3", "version": "0.5.3",