Merge branch 'latest' of /Users/seanlandsman/IdeaProjects/ag/ag-grid/react/ag-grid-react-example with conflicts.

This commit is contained in:
Sean Landsman
2017-10-05 13:02:49 +01:00
parent d2b92b4c9a
commit cbb4a31be6

View File

@@ -1,6 +1,6 @@
{ {
"name": "ag-grid-react-example", "name": "ag-grid-react-example",
"version": "13.3.0", "version": "13.2.0",
"description": "Example Reach applicaiton using ag-Grid.", "description": "Example Reach applicaiton using ag-Grid.",
"main": "dist/ag-grid-react-example.js", "main": "dist/ag-grid-react-example.js",
"scripts": { "scripts": {
@@ -58,9 +58,9 @@
"typescript": "2.3.x" "typescript": "2.3.x"
}, },
"dependencies": { "dependencies": {
"ag-grid": "13.3.x", "ag-grid": "file:../ag-grid",
"ag-grid-enterprise": "13.3.x", "ag-grid-enterprise": "13.2.x",
"ag-grid-react": "13.3.x", "ag-grid-react": "file:../ag-grid-react",
"bootstrap": "3.3.7", "bootstrap": "3.3.7",
"d3": "4.9.1", "d3": "4.9.1",
"file-loader": "0.11.1", "file-loader": "0.11.1",