Fixed merge issues.

Signed-off-by: Rick Beerendonk <[email protected]>

Author: rickbeerendonk

package-lock.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"