Fix conflicts

This commit is contained in:
qingwei.li
2016-08-17 13:56:23 +08:00
13 changed files with 243 additions and 1 deletions

View File

@@ -151,5 +151,8 @@
],
"badge": [
"./packages/badge/index.js"
],
"card": [
"./packages/card/index.js"
]
}