diff --git a/ecrire/inc/syndic.php b/ecrire/inc/syndic.php
index 4673232096b050ade42cf79580c97226ef7d20c2..2c1251443911847629f5f81ac0f6459b0ab372be 100644
--- a/ecrire/inc/syndic.php
+++ b/ecrire/inc/syndic.php
@@ -376,11 +376,7 @@ function ajouter_tags($matches, $item) {
 			// cas atom1, a faire apres flickr
 			$term = extraire_attribut($match[0], 'term')
 		) {
-<<<<<<< .working
-				$scheme = extraire_attribut($match[0], 'scheme');
-=======
 			if ($scheme = extraire_attribut($match[0], 'scheme'))
->>>>>>> .merge-right.r15241
 				$url = suivre_lien($scheme,$term);
 			else
 				$url = $term;