aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-08-20 14:14:46 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-08-20 14:14:46 -0300
commit917241e5e5df48c3c668e85afd1976235f703f72 (patch)
treef011a9ef5068d6b4a54c4239dbde13f43a7374e4
parent83963a3b52484d59f144e0c930c2f13af8eaae36 (diff)
downloadapps-917241e5e5df48c3c668e85afd1976235f703f72.tar.gz
apps-917241e5e5df48c3c668e85afd1976235f703f72.tar.bz2
Oops
-rwxr-xr-xinception4
m---------metadot0
2 files changed, 2 insertions, 2 deletions
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
-Subproject b21f57a3214055c88dafc1fd9332d75bf82519b
+Subproject 43ef7027c755ce37c49660906ee8f4ac81eada4