From 144f7f0a3d1f94c569a13a7079ee6f0d94b702fd Mon Sep 17 00:00:00 2001
From: Alban Crequy
Date: Mon, 24 Nov 2008 12:18:44 +0000
Subject: extensions/all.xml: Fix previous conflict
---
extensions/all.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
(limited to 'extensions')
diff --git a/extensions/all.xml b/extensions/all.xml
index 9e9ad6d5..f09d0be4 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -46,14 +46,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
from="Telepathy specification"/>
-
-
-
--
cgit v1.2.1