fixed merge conflict

LazyTesting · LazyTesting · commit 3b5f76f6a27c · 2016-11-09T20:26:03.000+01:00
diff --git a/engine/total-downhill-distance/package.json b/engine/total-downhill-distance/package.json
@@ -7,5 +7,9 @@
     "test": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha -- -R spec spec"
   },
   "author": "Maarten Groeneweg",
-  "license": "ISC"
+  "license": "ISC",
+  "devDependencies": {
+    "istanbul": "^0.4.5",
+    "mocha": "^3.1.2"
+  }
 }
