mirror of
https://github.com/Kong/insomnia
synced 2024-11-07 22:30:15 +00:00
conflicts
This commit is contained in:
parent
6c8446603d
commit
b49a70753b
@ -13,6 +13,8 @@
|
|||||||
"htmlhint": "^0.9.12",
|
"htmlhint": "^0.9.12",
|
||||||
"jsonlint": "^1.6.2",
|
"jsonlint": "^1.6.2",
|
||||||
"jsonschema": "^1.1.0",
|
"jsonschema": "^1.1.0",
|
||||||
|
"nunjucks": "^1.3.4",
|
||||||
|
"pouchdb": "^5.3.1",
|
||||||
"react": "^0.14.7",
|
"react": "^0.14.7",
|
||||||
"react-dom": "^0.14.7",
|
"react-dom": "^0.14.7",
|
||||||
"react-redux": "^4.4.1",
|
"react-redux": "^4.4.1",
|
||||||
|
Loading…
Reference in New Issue
Block a user