summaryrefslogtreecommitdiff
path: root/examples/docker-minimal/docker
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-02-27 02:51:42 +0100
committerLinus Nordberg <linus@nordberg.se>2015-02-27 02:51:42 +0100
commit2803956ca1e4862d991e4112234b90c2cb79a36c (patch)
treec61f07bfb19112836897bc5ec500b680b4039ebb /examples/docker-minimal/docker
parentf0ef2059fa5a5bbb65e7fd16817092066ad21112 (diff)
chmod +x merge.sh
Also fix path in README.
Diffstat (limited to 'examples/docker-minimal/docker')
-rwxr-xr-x[-rw-r--r--]examples/docker-minimal/docker/merge.sh0
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/docker-minimal/docker/merge.sh b/examples/docker-minimal/docker/merge.sh
index 2457428..2457428 100644..100755
--- a/examples/docker-minimal/docker/merge.sh
+++ b/examples/docker-minimal/docker/merge.sh