mirrors/vue-json-viewer
2
0
Fork 0
mirror of https://github.com/tenrok/vue-json-viewer.git synced 2026-06-08 17:22:32 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
陈峰
2018-07-02 17:26:18 +08:00
parent 1dee72499f
commit 0a7ff13b8d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
-4
View File
@@ -40,9 +40,6 @@ export default {
}
}
}
<<<<<<< HEAD
```
=======
```
## Result
![ABC](http://oxqqtdux0.bkt.clouddn.com/WX20180702-172158.png)
@@ -56,4 +53,3 @@ export default {
| show-copy | display the copy button |
| show-bigger | display the bigger button |
| icon-prefix | Custom Font icon prefix |
>>>>>>> eb16800904be1193c3eb7b87ff67048f22011a5b