From fc89591f78b24b57256d6ebf196e76b3e6fcae2d Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sat, 6 Mar 2010 00:03:52 +0000
Subject: [PATCH] un conflit fut commite en
http://trac.rezo.net/trac/spip/changeset/15253/spip/ecrire/inc/syndic.php
---
ecrire/inc/syndic.php | 4 ----
1 file changed, 4 deletions(-)
diff --git a/ecrire/inc/syndic.php b/ecrire/inc/syndic.php
index 4673232096..2c12514439 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;
--
GitLab