conflicts

This commit is contained in:
Gregory Schier 2016-04-16 09:32:50 -07:00
parent 6c8446603d
commit b49a70753b

View File

@ -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",