METexpress submodule conflict resolution

Dockerfile

@@ -1,5 +1,5 @@
 # This tag here should match the app's Meteor version, per .meteor/release
-FROM geoffreybooth/meteor-base:2.14 AS meteor-builder
+FROM geoffreybooth/meteor-base:2.16 AS meteor-builder
 
 ARG APPNAME
 

apps/met-anomalycor/.meteor/packages

@@ -6,7 +6,7 @@
 
 [email protected]             # Packages every Meteor app needs to have
 [email protected]       # Packages for a great mobile UX
-[email protected].8                   # The database Meteor supports right now
+[email protected].10                   # The database Meteor supports right now
 blaze-html-templates    # Compile .html files into Meteor Blaze views
 [email protected]            # Reactive variable for tracker
 [email protected]                  # Helpful client-side library
@@ -19,13 +19,13 @@ pcel:mysql
 seba:minifiers-autoprefixer
 [email protected]
 momentjs:moment
-randyp:mats-common@5.2.3
+randyp:mats-common@5.3.1
 [email protected]
-[email protected].10
+[email protected].11
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 kadira:blaze-layout
 ostrio:flow-router-extra
 meteorhacks:picker

apps/met-anomalycor/.meteor/release

@@ -1 +1 @@
-METEOR@2.15
+METEOR@2.16

apps/met-anomalycor/.meteor/versions

@@ -1,28 +1,28 @@
-[email protected].10
+[email protected].11
 [email protected]
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-blaze@2.8.0
+blaze@2.9.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-check@1.3.2
+check@1.4.1
 [email protected]
-[email protected].1
-[email protected].0
+[email protected].2
+[email protected].1
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 differential:[email protected]
 [email protected]
@@ -31,38 +31,38 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].5
+[email protected].6
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
 kadira:[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].3
+[email protected].4
 mdg:[email protected]
 [email protected]
 [email protected]
 meteorhacks:[email protected]
 meteortoys:[email protected]
 [email protected]
-minifier-js@2.7.5
-[email protected].3
+minifier-js@2.8.0
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 momentjs:[email protected]
-[email protected].8
+[email protected].10
 [email protected]
 [email protected]
 [email protected]
@@ -73,11 +73,11 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-ostrio:[email protected].0
+ostrio:[email protected].1
 pcel:[email protected]
 [email protected]
 [email protected]
-randyp:mats-common@5.2.3
+randyp:mats-common@5.3.1
 [email protected]
 [email protected]
 [email protected]
@@ -87,12 +87,12 @@ [email protected]
 risul:[email protected]
 [email protected]
 seba:[email protected]
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-spacebars@1.5.0
+spacebars@1.6.0
 [email protected]
 [email protected]
 [email protected]