{
  "name": "circle",
  "version": "0.0.0",
  "dependencies": {
    "bootstrap": "git://github.com/twbs/bootstrap.git#v3.3.2",
    "bootstrap3-typeahead": "3.1.0",
    "jquery.cookie": "1.2.0",
    "jquery": "http://code.jquery.com/jquery-2.1.4.min.js",
    "jquery-placeholder": "2.0.7",
    "font-awesome": "4.4.0",
    "octicons": "3.3.0",
    "uri.js": "1.10.2",
    "retina.js": "~1.0.1",
    "css-element-queries": "git://github.com/marcj/css-element-queries.git#6bf1d4a38791b1306b68afe7aca1adf5d7e0b675",
    "react": "0.13.3",
    "viewport-units-buggyfill": "0.3.1",
    "marked": "0.3.2",
    "d3": "3.5.5",
    "svg-injector": "1.1.3",
    "prism": "https://github.com/PrismJS/prism.git#~1.3.0"
  },
  "devDependencies": {
    "jquery-mockjax": "1.5.3"
  },
  "resolutions": {
    "jquery": "e-tag:W/\"553fb28"
  }
}

{
  "name": "circle",
  "version": "0.0.0",
  "dependencies": {
    "bootstrap": "git://github.com/twbs/bootstrap.git#v3.3.2",
    "bootstrap3-typeahead": "3.1.0",
    "jquery.cookie": "1.2.0",
    "jquery": "http://code.jquery.com/jquery-2.1.4.min.js",
    "jquery-placeholder": "2.0.7",
    "font-awesome": "4.4.0",
    "octicons": "3.3.0",
    "uri.js": "1.10.2",
    "retina.js": "~1.0.1",
    "css-element-queries": "git://github.com/marcj/css-element-queries.git#6bf1d4a38791b1306b68afe7aca1adf5d7e0b675",
    "react": "0.13.3",
    "viewport-units-buggyfill": "0.3.1",
    "marked": "0.3.2",
    "d3": "3.5.5",
    "svg-injector": "1.1.3",
    "prism": "https://github.com/PrismJS/prism.git#~1.3.0"
  },
  "devDependencies": {
    "jquery-mockjax": "1.5.3"
  },
  "resolutions": {
    "jquery": "e-tag:553fb284-"
  }
}

Revert "Using new etag to resolve jquery on conflict."
Revert "Using new etag to resolve jquery on conflict."
