Fixed merge issues.

Signed-off-by: Rick Beerendonk <rick@beerendonk.com>
rickbeerendonk · Jun 22, 2017 · b630da1 · b630da1
1 parent f517ec3
commit b630da1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "babel-standalone": "6.25.0",
-    "prop-types": "^15.5.10",   
+    "prop-types": "^15.5.10",
     "react": "next",
     "react-dom": "next",
     "react-transition-group": "^1.2.0"