From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 20 Aug 2017 17:14:35 +0000 (-0300)
Subject: Oops
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=43ef7027c755ce37c49660906ee8f4ac81eada4c;p=metadot.git

Oops
---

diff --git a/metadot b/metadot
index 3c4f111..bc929f3 100755
--- a/metadot
+++ b/metadot
@@ -160,8 +160,8 @@ function metadot_fetch {
 function metadot_merge {
   if [ -d "$DOT/.git" ]; then
     (
-    cd $DOT && $GIT merge origin/master                 && \\
-               $GIT submodule sync          --recursive && \\
+    cd $DOT && $GIT merge origin/master                 && \
+               $GIT submodule sync          --recursive && \
                $GIT submodule update --init --recursive
     )
   fi