Resolve conflict in package.json

package.json

@@ -46,10 +46,7 @@
     "d3-shape": "^1.2.0",
     "d3-time": "^1.0.8",
     "d3-time-format": "^2.1.1",
-<<<<<<< HEAD
     "d3-transition": "^1.1.1",
-=======
->>>>>>> upstream/master
     "dateformat": "^3.0.3",
     "deckar01-task_list": "^2.0.0",
     "diff": "^3.4.0",