fix(npm): Remove git diff comment

Crap....

Author: Awk34

app/templates/_package.json

@@ -45,7 +45,6 @@
     "grunt-contrib-imagemin": "~0.7.1",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-uglify": "~0.4.0",
-<<<<<<< HEAD
     "grunt-contrib-watch": "~0.6.1",<% if (filters.coffee) { %>
     "grunt-contrib-coffee": "^0.10.1",<% } %><% if (filters.jade) { %>
     "grunt-contrib-jade": "^0.11.0",<% } %><% if (filters.less) { %>