From b84c798cc25b8dbcc02c7642948aca3eacba9a4c Mon Sep 17 00:00:00 2001
From: Pietro Incardona <i-bird@private-incardon-3.mpi-cbg.de>
Date: Wed, 7 Sep 2016 15:30:30 +0200
Subject: [PATCH] Passing test

---
 src/VCluster_semantic_unit_tests.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/VCluster_semantic_unit_tests.hpp b/src/VCluster_semantic_unit_tests.hpp
index 87fc830..e85546f 100644
--- a/src/VCluster_semantic_unit_tests.hpp
+++ b/src/VCluster_semantic_unit_tests.hpp
@@ -1374,5 +1374,4 @@ BOOST_AUTO_TEST_CASE (Vcluster_semantic_sendrecv_6)
 
 BOOST_AUTO_TEST_SUITE_END()
 
-#endif /* OPENFPM_VCLUSTER_SRC_VCLUSTER_SEMANTIC_UNIT_TESTS_HPP_ */
->>>>>>> origin/gather_with_packer
+#endif /* OPENFPM_VCLUSTER_SRC_VCLUSTER_SEMANTIC_UNIT_TESTS_HPP_ */
-- 
GitLab