{
  "name": "socalloc",
  "version": "1.0.0",
  "description": "Society fund allocator",
  "dependencies": {
    "bootstrap": "~3.2.0",
    "angular": "~1.2.7",
    "angular-route": "~1.2.7",
    "angular-resource": "~1.2.7"
  },
  "license": "MIT",
  "private": true,
  "ignore": [
    "**/.*",
    "bower_components"
  ]
}

{
  "name": "socalloc",
  "version": "1.0.0",
  "description": "Society fund allocator",
  "dependencies": {
    "bootstrap": "~3.2.0",
    "angular": "1.2.7",
    "angular-route": "1.2.7",
    "angular-resource": "1.2.7"
  },
  "license": "MIT",
  "private": true,
  "ignore": [
    "**/.*",
    "bower_components"
  ]
}

Revert previous change due to conflicts
Revert previous change due to conflicts
