From 6fe549f92e02bff4ef709ecb08b8f4a4cd71f71f Mon Sep 17 00:00:00 2001 From: maikkeli Date: Thu, 28 Jan 2016 00:30:05 +1030 Subject: [PATCH] fix error --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c8c4ce2..ce85229 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,7 +62,7 @@ WORKDIR /srv/ledgersmb # checkout specified tag/branch/commit (**NOTE above) # merge changes to current checked out branch RUN git fetch \ - && git checkout $LSMB_VERSION + && git checkout $LSMB_VERSION \ && git merge || echo "git merge failed - this is expected if [$LSMB_VERSION] isn't a branch" #RUN sed -i \