From cbb4a31be657e7bf907083d2bb3b6cf9b8d43d76 Mon Sep 17 00:00:00 2001
From: Sean Landsman <sean@thelandsmans.com>
Date: Thu, 5 Oct 2017 13:02:49 +0100
Subject: [PATCH] Merge branch 'latest' of
 /Users/seanlandsman/IdeaProjects/ag/ag-grid/react/ag-grid-react-example with
 conflicts.

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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