From e0351d80384e765d2cac950294608142015515af Mon Sep 17 00:00:00 2001
From: Pietro Incardona <i-bird@private-incardon-3.mpi-cbg.de>
Date: Wed, 7 Sep 2016 16:59:39 +0200
Subject: [PATCH] Fixing conflict

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

diff --git a/openfpm_vcluster b/openfpm_vcluster
index 91de3907f..b84c798cc 160000
--- a/openfpm_vcluster
+++ b/openfpm_vcluster
@@ -1 +1 @@
-Subproject commit 91de3907fa0f05ab6a0a3b9456f70952705d0fc3
+Subproject commit b84c798cc25b8dbcc02c7642948aca3eacba9a4c
-- 
GitLab