Commit 7d1dc0b3 authored by K9260's avatar K9260 🎅🏼

Merge

parent 6f6b7b63
......@@ -3262,7 +3262,6 @@
"statuses": "~1.4.0",
"type-is": "~1.6.16",
"utils-merge": "1.0.1",
<<<<<<< HEAD
"vary": "1.1.2"
},
"dependencies": {
......@@ -3287,9 +3286,6 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true
}
=======
"vary": "~1.1.2"
>>>>>>> origin/dev_responsiveui
}
},
"extend-shallow": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment