Skip to content

Commit 1f8b95f

Browse files
tangram-jstangram-js
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # README.md # docs/demo/index.html
2 parents 5dbecca + d80aa00 commit 1f8b95f

10 files changed

+50
-1
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# json-editor
22

3+
<<<<<<< HEAD
34
> A schema-aware editor for JSON document. It provides a tree view to present the structure of JSON document, user could manipulate the JSON from context menu. There is a text view to present the content of JSON document, user may edit JSON within.
5+
=======
6+
> A schema-aware JSON editor.
7+
>>>>>>> origin/master
48
> Develop with Vue.js 2.
59
> Please reference the [project website](https://json-editor.tangramjs.com) fro detail.
610

‎docs/demo/index.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
<!DOCTYPE html><html><head><meta charset=utf-8><title>json-editor</title><link href=/static/css/app.1c505032c88bdc6ca4d17c420f39ca86.css rel=stylesheet><link href=/static/css/vendors.34d13d0c6398972b5e1db6cb001c0f7a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.448a4b9f8f924f78d993.js></script><script type=text/javascript src=/static/js/vendor.21632927f8231573309f.js></script><script type=text/javascript src=/static/js/app.5fc6e445ab75a05e5f9e.js></script><script type=text/javascript src=/static/js/vendors.5f51a0b8077b742a05d6.js></script></body></html>
1+
<<<<<<< HEAD
2+
<!DOCTYPE html><html><head><meta charset=utf-8><title>json-editor</title><link href=/static/css/app.1c505032c88bdc6ca4d17c420f39ca86.css rel=stylesheet><link href=/static/css/vendors.34d13d0c6398972b5e1db6cb001c0f7a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.448a4b9f8f924f78d993.js></script><script type=text/javascript src=/static/js/vendor.21632927f8231573309f.js></script><script type=text/javascript src=/static/js/app.5fc6e445ab75a05e5f9e.js></script><script type=text/javascript src=/static/js/vendors.5f51a0b8077b742a05d6.js></script></body></html>
3+
=======
4+
<!DOCTYPE html><html><head><meta charset=utf-8><title>json-editor</title><link href=static/css/app.1c505032c88bdc6ca4d17c420f39ca86.css rel=stylesheet><link href=static/css/vendors.34d13d0c6398972b5e1db6cb001c0f7a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/manifest.b8e111229eda8cb87f25.js></script><script type=text/javascript src=static/js/vendor.e2b0f39a1ab026966b4f.js></script><script type=text/javascript src=static/js/app.6290422cd68510b43c1c.js></script><script type=text/javascript src=static/js/vendors.4aba5d60e81d34c22519.js></script></body></html>
5+
>>>>>>> origin/master

‎docs/demo/static/js/app.5fc6e445ab75a05e5f9e.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/demo/static/js/app.5fc6e445ab75a05e5f9e.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/demo/static/js/manifest.448a4b9f8f924f78d993.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/demo/static/js/manifest.448a4b9f8f924f78d993.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/demo/static/js/vendor.21632927f8231573309f.js‎

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/demo/static/js/vendor.21632927f8231573309f.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/demo/static/js/vendors.5f51a0b8077b742a05d6.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/demo/static/js/vendors.5f51a0b8077b742a05d6.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)