{
  "author": "Dança.com",
  "bugs": {
    "url": "https://github.com/dancacom/guide/issues"
  },
  "dependencies": {
    "bourbon-neat": "^2.1.0",
    "normalize.css": "^7.0.0"
  },
  "devDependencies": {
    "browser-sync": "2.18.13",
    "gulp": "3.9.1",
    "gulp-autoprefixer": "4.0.0",
    "gulp-clean-css": "3.9.0",
    "gulp-imagemin": "3.4.0",
    "gulp-livereload": "3.8.1",
    "gulp-sass": "3.1.0",
    "run-sequence": "2.2.0"
  },
  "description": "Dança.com - Styleguide",
  "homepage": "https://github.com/dancacom/guide#readme",
  "keywords": [
    "component",
    "css",
    "danca.com",
    "dança.com",
    "danca",
    "dança",
    "dance",
    "html",
    "js",
    "styleguide"
  ],
  "license": "MIT",
  "main": "index.html",
  "name": "danca-guide",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/dancacom/guide.git"
  },
  "scripts": {
    "build": "gulp build",
    "dev": "gulp"
  },
  "version": "0.34.0"
}

{
  "author": "Dança.com",
  "bugs": {
    "url": "https://github.com/dancacom/guide/issues"
  },
  "dependencies": {
    "bourbon-neat": "^2.1.0"
  },
  "devDependencies": {
    "browser-sync": "2.18.13",
    "gulp": "3.9.1",
    "gulp-autoprefixer": "4.0.0",
    "gulp-clean-css": "3.9.0",
    "gulp-imagemin": "3.4.0",
    "gulp-livereload": "3.8.1",
    "gulp-sass": "3.1.0",
    "run-sequence": "2.2.0"
  },
  "description": "Dança.com - Styleguide",
  "homepage": "https://github.com/dancacom/guide#readme",
  "keywords": [
    "component",
    "css",
    "danca.com",
    "dança.com",
    "danca",
    "dança",
    "dance",
    "html",
    "js",
    "styleguide"
  ],
  "license": "MIT",
  "main": "index.html",
  "name": "danca-guide",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/dancacom/guide.git"
  },
  "scripts": {
    "build": "gulp build",
    "dev": "gulp"
  },
  "version": "0.34.0"
}

Fix the conflict branch master.
Fix the conflict branch master.
