]> gitweb.fluxo.info Git - rhatto/apps.git/commitdiff
Oops
authorSilvio Rhatto <rhatto@riseup.net>
Sun, 20 Aug 2017 17:14:46 +0000 (14:14 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sun, 20 Aug 2017 17:14:46 +0000 (14:14 -0300)
inception
metadot

index 2c0d2ffb37686352cad150960d9d0d3f681bf3dc..1ae917220c5d746d50d582a49a0758c9939365c4 100755 (executable)
--- 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 b21f57a3214055c88dafc1fd9332d75bf82519bc..43ef7027c755ce37c49660906ee8f4ac81eada4c 160000 (submodule)
--- a/metadot
+++ b/metadot
@@ -1 +1 @@
-Subproject commit b21f57a3214055c88dafc1fd9332d75bf82519bc
+Subproject commit 43ef7027c755ce37c49660906ee8f4ac81eada4c