{
  "name": "fd-angular-core",
  "version": "1.0.0",
  "description": "Personal Angular utils",
  "repository": "https://github.com/fd/fd-angular-core.git",
  "main": "lib/index.js",
  "scripts": {
    "test": "echo 'No tests...'",
    "deploy-doc": "make deploy",
    "build": "make"
  },
  "keywords": [
    "utils",
    "angular"
  ],
  "author": "Simon Menke",
  "license": "MIT",
  "devDependencies": {
    "babel": "^5.4.7",
    "babel-eslint": "^3.1.19",
    "browserify": "^10.2.3",
    "eslint": "^0.24.0",
    "exorcist": "^0.4.0",
    "jsdoc": "^3.3.2"
  },
  "dependencies": {
    "angular": "1.4.x",
    "angular-ui-router": "0.2.x",
    "jquery": "*",
    "mr-util": "0.x.x"
  },
  "jspm": {
    "format": "es6",
    "main": "src/index.js",
    "ignore": [
      "node_modules/**/*"
    ]
  }
}

{
  "name": "fd-angular-core",
  "version": "1.0.0",
  "description": "Personal Angular utils",
  "repository": "https://github.com/fd/fd-angular-core.git",
  "main": "lib/index.js",
  "scripts": {
    "test": "echo 'No tests...'",
    "deploy-doc": "make deploy",
    "build": "make"
  },
  "keywords": [
    "utils",
    "angular"
  ],
  "author": "Simon Menke",
  "license": "MIT",
  "devDependencies": {
    "babel": "^5.4.7",
    "babel-eslint": "^3.1.19",
    "browserify": "^10.2.3",
    "eslint": "^0.24.0",
    "exorcist": "^0.4.0",
    "jsdoc": "^3.3.2"
  },
  "dependencies": {
    "angular": "1.4.x",
    "angular-ui-router": "0.2.x",
    "jquery": "*",
    "mr-util": "0.x.x"
  },
  "jspm": {
    "jspmNodeConversion": false,
    "format": "es6",
    "main": "src/index.js",
    "dependencies": {
      "angular": "jspm:angular",
      "angular-ui-router": "jspm:angular-ui-router",
      "jquery": "jspm:jquery",
      "mr-util": "npm:mr-util"
    }
  }
}

Revert "Attempt to use npm:angular"
Revert "Attempt to use npm:angular"

This reverts commit 836757644bcb3b319a8d3f09bd60e8cecfac5fab.

Conflicts:
	package.json
