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

update merge conflict

Browse source
This commit is contained in:
Vincent Chavez 2017-05-19 09:39:32 -07:00
parent 5d61c76051
commit 0ebc93768f
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/mdSpinner/mdSpinner.vue
View file

@ -2,11 +2,7 @@
<transition name="md-spinner" appear>
<div class="md-spinner" :class="[themeClass, classes]":style="styles">
<svg class="md-spinner-draw" viewBox="25 25 50 50">
<<<<<<< HEAD
<circle class="md-spinner-path" cx="50" cy="50" r="20" :stroke-width="mdStroke" :stroke-dasharray="dashProgress"></circle>
=======
<circle class="md-spinner-path" cx="50" cy="50" r="20" :stroke-width="mdStroke" :stroke-dasharray="dashProgress" />
>>>>>>> 369f3f0e392dd4fcc2c4e26e80a2e36d6dcf54cd
</svg>
</div>
</transition>