From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 11 Aug 2018 20:56:27 +0000 (+0200)
Subject: woops, broken merge
X-Git-Tag: v3_21~261^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/55063ea2265a9fbbbc4f17529f45d84b2c847c14

woops, broken merge
---

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index dae1364bf5..c33de9ee87 100644
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -101,13 +101,8 @@ foreach(example actor-create actor-daemon actor-join actor-kill
                 energy-exec energy-boot energy-link energy-vm
                 engine-filtering
                 exec-async exec-basic exec-dvfs exec-monitor exec-ptask exec-remote
-<<<<<<< HEAD
-                platform-properties plugin-hostload mutex
-                io-async io-file-system io-file-remote io-storage-raw
-=======
                 platform-failures platform-properties plugin-hostload mutex
-                io-file-system io-file-remote io-storage-raw
->>>>>>> 4ccbacb51eb49323847a906c3e79ea838d76e2a7
+                io-async io-file-system io-file-remote io-storage-raw
                 replay-comm replay-storage
                 routing-get-clusters
                 )