From: Silvio Rhatto Date: Sun, 20 Aug 2017 17:14:46 +0000 (-0300) Subject: Oops X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=917241e5e5df48c3c668e85afd1976235f703f72;p=rhatto%2Fapps.git Oops --- diff --git a/inception b/inception index 2c0d2ff..1ae9172 100755 --- a/inception +++ b/inception @@ -136,8 +136,8 @@ function inception_fetch { # Merge function inception_merge { ( - cd $DIRNAME && $GIT merge origin/master && \\ - $GIT submodule sync --recursive && \\ + cd $DIRNAME && $GIT merge origin/master && \ + $GIT submodule sync --recursive && \ $GIT submodule update --init --recursive ) } diff --git a/metadot b/metadot index b21f57a..43ef702 160000 --- a/metadot +++ b/metadot @@ -1 +1 @@ -Subproject commit b21f57a3214055c88dafc1fd9332d75bf82519bc +Subproject commit 43ef7027c755ce37c49660906ee8f4ac81eada4c