fixing package.json

package.json

@@ -1,42 +1,4 @@
 {
-<<<<<<< HEAD
-  "name": "decorator",
-  "version": "4.5.2",
-  "dependencies": {},
-  "devDependencies": {
-    "autoprefixer": "^6.3.2",
-    "grunt": "~0.4.1",
-    "grunt-bower-install": "^1.6.0",
-    "grunt-browser-sync": "^2.1.3",
-    "grunt-concurrent": "~0.4.0",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-compass": "^1.0.4",
-    "grunt-contrib-compress": "^0.7.0",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-cssmin": "~0.7.0",
-    "grunt-contrib-htmlmin": "~0.1.3",
-    "grunt-contrib-imagemin": "~0.5.0",
-    "grunt-contrib-jshint": "^0.11.3",
-    "grunt-contrib-sass": "^0.9.2",
-    "grunt-contrib-uglify": "~0.2.0",
-    "grunt-contrib-watch": "~0.5.2",
-    "grunt-mocha": "^0.4.15",
-    "grunt-modernizr": "~0.6.1",
-    "grunt-newer": "~0.6.0",
-    "grunt-postcss": "^0.7.2",
-    "grunt-rev": "~0.1.0",
-    "grunt-svgmin": "~0.2.0",
-    "grunt-text-replace": "^0.4.0",
-    "grunt-usemin": "~2.0.0",
-    "jshint-stylish": "~0.1.3",
-    "load-grunt-tasks": "~0.2.0",
-    "postcss": "^5.0.0",
-    "time-grunt": "~0.2.0"
-  },
-  "engines": {
-    "node": ">=0.8.0"
-=======
   "name": "Decorator-V5",
   "version": "5.0.2",
   "description": "Front end files for the UCSD Cascade CMS templates.",
@@ -81,6 +43,5 @@
     "gulp-zip": "^5.0.1",
     "gulp4-run-sequence": "^1.0.1",
     "run-sequence": "^2.2.1"
->>>>>>> 1b6adace46eb4584ee87521897258f772c8ba1d9
   }
 }