{
  "name": "gulp-frau-publisher",
  "version": "0.0.1",
  "description": "Utility for publishing free-range apps to our CDN.",
  "main": "publisher.js",
  "scripts": {
    "test": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
  },
  "repository": {
    "type": "git",
    "url": "https://github.com/Desire2Learn-Valence/gulp-frau-publisher.git"
  },
  "author": "D2L Corporation",
  "license": "Apache 2.0",
  "devDependencies": {
    "chai": "^1.9.2",
    "coveralls": "^2.11.2",
    "gulp-s3": "^0.3.0",
    "istanbul": "^0.3.2",
    "sandboxed-module": "^1.0.2",
    "sinon": "^1.11.1",
    "sinon-chai": "^2.6.0"
  },
  "dependencies": {
    "gulp-s3": "^0.3.0"
  }
}

{
  "name": "gulp-frau-publisher",
  "version": "0.0.1",
  "description": "Utility for publishing free-range apps to our CDN.",
  "main": "publisher.js",
  "scripts": {
    "test": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
  },
  "repository": {
    "type": "git",
    "url": "https://github.com/Desire2Learn-Valence/gulp-frau-publisher.git"
  },
  "author": "D2L Corporation",
  "license": "Apache 2.0",
  "devDependencies": {
    "chai": "^1.9.2",
    "coveralls": "^2.11.2",
    "gulp-s3": "^0.3.0",
    "mocha": "^2.0.1",
    "istanbul": "^0.3.2",
    "sandboxed-module": "^1.0.2",
    "sinon": "^1.11.1",
    "sinon-chai": "^2.6.0"
  },
  "dependencies": {
    "gulp-s3": "^0.3.0"
  }
}

Fix a merge resolution error
Fix a merge resolution error
