Created
November 13, 2015 09:47
-
-
Save mmun/118c9a6c010c54d6bc0e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"name": "client-portal", | |
"version": "1.0.17", | |
"description": "Meals portal for Zesty clients", | |
"private": true, | |
"directories": { | |
"doc": "doc", | |
"test": "tests" | |
}, | |
"scripts": { | |
"start": "ember server", | |
"build": "ember build", | |
"test": "ember test" | |
}, | |
"repository": "", | |
"engines": { | |
"node": ">= 0.10.0" | |
}, | |
"author": "", | |
"license": "MIT", | |
"devDependencies": { | |
"active-model-adapter": "2.0.1", | |
<<<<<<< Updated upstream | |
"broccoli-asset-rev": "2.0.6", | |
||||||| merged common ancestors | |
"broccoli-asset-rev": "^2.1.2", | |
"broccoli-merge-trees": "^0.2.3", | |
"broccoli-static-compiler": "^0.2.2", | |
======= | |
<<<<<<< Updated upstream | |
"broccoli-asset-rev": "^2.1.2", | |
"broccoli-merge-trees": "^0.2.3", | |
"broccoli-static-compiler": "^0.2.2", | |
>>>>>>> Stashed changes | |
"ember-cli": "1.13.8", | |
"ember-cli-app-version": "0.5.0", | |
"ember-cli-babel": "^5.1.3", | |
||||||| merged common ancestors | |
"broccoli-asset-rev": "2.0.6", | |
"ember-cli": "1.13.8", | |
"ember-cli-app-version": "0.5.0", | |
"ember-cli-babel": "^5.1.3", | |
======= | |
"broccoli-asset-rev": "2.0.6", | |
"ember-cli": "1.13.12", | |
"ember-cli-app-version": "^1.0.0", | |
"ember-cli-babel": "^5.1.5", | |
>>>>>>> Stashed changes | |
"ember-cli-bugsnag": "^0.0.10", | |
<<<<<<< Updated upstream | |
"ember-cli-dependency-checker": "^1.0.1", | |
"ember-cli-deploy": "^0.5.1", | |
"ember-cli-deploy-zesty-pack": "^0.1.2", | |
"ember-cli-envy": "^1.0.0", | |
"ember-cli-htmlbars": "~0.7.10", | |
"ember-cli-htmlbars-inline-precompile": "~0.3.1", | |
||||||| merged common ancestors | |
"ember-cli-dependency-checker": "^1.0.1", | |
"ember-cli-deploy": "^0.5.1", | |
"ember-cli-deploy-zesty-pack": "^0.1.2", | |
"ember-cli-envy": "^1.0.0", | |
"ember-cli-htmlbars": "~0.7.10", | |
"ember-cli-htmlbars-inline-precompile": "~0.3.1", | |
======= | |
"ember-cli-dependency-checker": "^1.1.0", | |
"ember-cli-deploy": "^0.5.1", | |
"ember-cli-deploy-zesty-pack": "^0.1.2", | |
"ember-cli-envy": "^1.0.0", | |
"ember-cli-htmlbars": "^1.0.1", | |
"ember-cli-htmlbars-inline-precompile": "^0.3.1", | |
>>>>>>> Stashed changes | |
"ember-cli-inject-live-reload": "^1.3.1", | |
"ember-cli-moment-shim": "0.6.1", | |
"ember-cli-pretender": "~0.5.0", | |
<<<<<<< Updated upstream | |
"ember-cli-qunit": "^1.0.0", | |
<<<<<<< Updated upstream | |
||||||| merged common ancestors | |
"ember-cli-release": "~0.2.6", | |
======= | |
"ember-cli-release": "~0.2.6", | |
||||||| merged common ancestors | |
"ember-cli-qunit": "^1.0.0", | |
======= | |
"ember-cli-qunit": "^1.0.4", | |
>>>>>>> Stashed changes | |
>>>>>>> Stashed changes | |
"ember-cli-sass": "5.0.1", | |
"ember-cli-sri": "^1.1.0", | |
"ember-cli-styles-reloader": "0.1.8", | |
"ember-cli-uglify": "^1.2.0", | |
<<<<<<< Updated upstream | |
"ember-data": "1.13.13", | |
"ember-disable-proxy-controllers": "^1.0.0", | |
"ember-export-application-global": "^1.0.3", | |
<<<<<<< Updated upstream | |
"ember-metrics": "0.5.1", | |
||||||| merged common ancestors | |
======= | |
||||||| merged common ancestors | |
"ember-data": "1.13.13", | |
"ember-disable-proxy-controllers": "^1.0.0", | |
"ember-export-application-global": "^1.0.3", | |
======= | |
"ember-data": "1.13.15", | |
"ember-disable-proxy-controllers": "^1.0.1", | |
"ember-export-application-global": "^1.0.4", | |
>>>>>>> Stashed changes | |
>>>>>>> Stashed changes | |
"ember-moment": "3.6.1", | |
"ember-redirect-to": "1.0.0", | |
"ember-stripe-service": "^3.0.0" | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment