Correction du merge

diff --git a/buildout.cfg b/buildout.cfg
index c2cc850..0e74473 100644 (file)
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -2,10 +2,6 @@
 extends = versions.cfg
 extensions = buildout-versions
 buildout_versions_file = versions.cfg
-<<<<<<< HEAD
-=======
-parts = django articles harvest sphinx_config alertes_courriel
->>>>>>> test
 versions = versions
 parts = django articles harvest sphinx_config alertes_courriel
 find-links =