From 8818ef929ec86635407364438e4304b40014fad0 Mon Sep 17 00:00:00 2001 From: TApplencourt Date: Fri, 15 Jan 2016 16:29:44 +0100 Subject: [PATCH] Fix merging problem --- install/scripts/install_ocaml.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh index a1ca06a1..138251d4 100755 --- a/install/scripts/install_ocaml.sh +++ b/install/scripts/install_ocaml.sh @@ -76,5 +76,4 @@ source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true NCPUs=$(cat /proc/cpuinfo | grep -i MHz | wc -l) ${QP_ROOT}/bin/opam install -j ${NCPUs} ${PACKAGES} -y -q || exit 1 -rm -f ../_build/ocaml.log -exit 0 \ No newline at end of file +rm -f ../_build/ocaml.log \ No newline at end of file