Update Meteor .versions files after rebase

This commit is contained in:
Erik Ziegler 2017-06-14 11:17:15 +02:00
parent f9c9c1db39
commit de5fe8d534
4 changed files with 5 additions and 33 deletions

View File

@ -60,16 +60,7 @@ aldeed:simple-schema # Third party package to deal with schemas
aldeed:template-extension@4.0.0
aldeed:collection2
zuuk:stale-session
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
email@1.1.18
peppelg:bootstrap-3-modal
simple:reactive-method
fastclick@1.0.13
standard-minifier-css@1.3.2
standard-minifier-js@1.2.1
=======
gilbertwat:bootstrap3-daterangepicker
>>>>>>> Move towards NPM for Cornerstone dependencies
dangrossman:bootstrap-daterangepicker
johdirr:meteor-git-rev
u2622:persistent-session@0.4.4
shell-server@0.2.3

View File

@ -27,11 +27,7 @@ clinical:fonts@1.1.4
clinical:hipaa-audit-log@2.4.2
clinical:hipaa-logger@1.0.1
clinical:theming@0.4.10
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
coffeescript@1.11.1_4
dangrossman:bootstrap-daterangepicker@2.1.13
=======
>>>>>>> Move towards NPM for Cornerstone dependencies
ddp@1.2.5
ddp-client@1.3.4
ddp-common@1.2.8
@ -87,14 +83,9 @@ mongo-id@1.0.6
mrt:moment@2.8.1
natestrauser:select2@4.0.3
npm-bcrypt@0.9.2
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
npm-mongo@2.2.11_2
observe-sequence@1.0.14
ohif:commands@0.0.1
=======
npm-mongo@2.2.24
observe-sequence@1.0.16
>>>>>>> Move towards NPM for Cornerstone dependencies
ohif:commands@0.0.1
ohif:core@0.0.1
ohif:cornerstone@0.0.1
ohif:design@0.0.1

View File

@ -19,13 +19,8 @@ boilerplate-generator@1.1.0
caching-compiler@1.1.9
caching-html-compiler@1.1.2
callback-hook@1.0.10
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
check@1.2.4
coffeescript@1.11.1_4
dangrossman:bootstrap-daterangepicker@2.1.13
=======
check@1.2.5
>>>>>>> Move towards NPM for Cornerstone dependencies
dangrossman:bootstrap-daterangepicker@2.1.13
ddp@1.2.5
ddp-client@1.3.4
ddp-common@1.2.8
@ -43,6 +38,7 @@ es5-shim@4.6.15
fastclick@1.0.13
fortawesome:fontawesome@4.7.0
geojson-utils@1.0.10
gilbertwat:bootstrap3-daterangepicker@1.3.21_1
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
@ -77,14 +73,9 @@ momentjs:moment@2.16.0
mongo@1.1.18
mongo-id@1.0.6
natestrauser:select2@4.0.3
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
npm-mongo@2.2.11_2
observe-sequence@1.0.14
ohif:commands@0.0.1
=======
npm-mongo@2.2.24
observe-sequence@1.0.16
>>>>>>> Move towards NPM for Cornerstone dependencies
ohif:commands@0.0.1
ohif:core@0.0.1
ohif:cornerstone@0.0.1
ohif:design@0.0.1

View File

@ -20,7 +20,6 @@ caching-compiler@1.1.9
caching-html-compiler@1.1.2
callback-hook@1.0.10
check@1.2.5
coffeescript@1.11.1_4
dangrossman:bootstrap-daterangepicker@2.1.13
ddp@1.2.5
ddp-client@1.3.4