From ded22cf318416d0ea17624e00b265398dbd922d7 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sun, 24 Jan 2021 22:43:15 +0100
Subject: [PATCH] fix pip build

---
 MANIFEST.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 53b252d5ed..69ec60fa1a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1738,10 +1738,6 @@ include teshsuite/xbt/signals/signals.tesh
 include tools/MSG_visualization/colorize.pl
 include tools/MSG_visualization/trace2fig.pl
 include tools/address_sanitizer.supp
-<<<<<<< HEAD
-include tools/doxygen/fig2dev_postprocessor.pl
-=======
->>>>>>> 0e860ce2fbd8d2781d6c1129bb41cb788380f398
 include tools/fix-paje-trace.sh
 include tools/generate-dwarf-functions
 include tools/graphicator/graphicator.cpp
-- 
2.20.1