[Telepathy-commits] [telepathy-salut/master] extensions/all.xml: Fix previous conflict

[Alban Crequy]

---
 extensions/all.xml |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/extensions/all.xml b/extensions/all.xml
index 9e9ad6d..f09d0be 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</p>
     from="Telepathy specification"/>
 
   <!-- use types from Channel_Type_Tubes -->
-  <tp:external-type name="Socket_Address_Type" type="u"
-    from="Telepathy specification"/>
-  <tp:external-type name="Socket_Access_Control" type="u"
+  <tp:external-type name="DBus_Tube_Member" type="(us)"
     from="Telepathy specification"/>
   <tp:external-type name="Supported_Socket_Map" type="a{uau}"
     from="Telepathy specification"/>
-  <tp:external-type name="DBus_Tube_Member" type="(us)"
-    from="Telepathy specification"/>
 </tp:generic-types>
 
 </tp:spec>
-- 
1.5.6.5