From 0c184e19bd4f1b0f32a33210a1c716686f4402c5 Mon Sep 17 00:00:00 2001
From: Markus <gitlab@mcgalaxy.de>
Date: Thu, 9 Aug 2018 00:53:02 +0200
Subject: [PATCH] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6dca7cd..229cbed 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
 			steps {
 				sh 'apt-get update'
 				sh 'git submodule update --init --remote --recursive'
-				sh 'git submodule update'
+				sh 'git submodule update --merge'
 				sh './attach_modules.sh'
 				sh 'cd libraries; ./build.sh'