Hopiu/vue-material
1
0
Fork 0
mirror of https://github.com/Hopiu/vue-material.git synced 2026-03-16 22:10:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Other merge conflicts

Browse source
This commit is contained in:
Vincent Chavez 2017-05-19 09:41:59 -07:00
parent 0ebc93768f
commit a62ca9c132
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -10,19 +10,13 @@
<a href="https://www.npmjs.com/package/vue-material">
<img src="https://img.shields.io/npm/dt/vue-material.svg" alt="Downloads">
</a>
<<<<<<< HEAD
<a href="https://www.npmjs.com/package/vue-material">
<img src="https://img.shields.io/npm/v/vue-material.svg" alt="Version">
=======
<a href="https://www.npmjs.com/package/vue-material">
<img src="https://img.shields.io/npm/v/vue-material.svg" alt="Version">
</a>
</a>
<a href="https://cdnjs.com/libraries/vue-material">
<img src="https://img.shields.io/cdnjs/v/vue-material.svg" alt="Version">
>>>>>>> 369f3f0e392dd4fcc2c4e26e80a2e36d6dcf54cd
</a>
<a href="https://www.npmjs.com/package/vue-material">

5
package.json
View file

@ -69,14 +69,9 @@
"eslint-plugin-html": "^2.0.1",
"eventsource-polyfill": "^0.9.6",
"express": "^4.14.1",
<<<<<<< HEAD
"extract-text-webpack-plugin": "beta",
"friendly-errors-webpack-plugin": "^1.3.1",
=======
"extract-text-webpack-plugin": "^2.1.0",
"file-loader": "^0.10.0",
"friendly-errors-webpack-plugin": "^1.1.3",
>>>>>>> 369f3f0e392dd4fcc2c4e26e80a2e36d6dcf54cd
"highlight.js": "^9.9.0",
"html-webpack-plugin": "^2.28.0",
"node-sass": "^4.5.0",