diff --git a/channelselector.py b/channelselector.py
index c20afd1a..6e80b2ee 100644
--- a/channelselector.py
+++ b/channelselector.py
@@ -69,7 +69,7 @@ def getchanneltypes(view="thumb_"):
     logger.info()
 
     # Lista de categorias
-    channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "direct", "torrent"]
+    channel_types = ["movie", "tvshow", "anime", "documentary", "vos", "direct"] # , "torrent"
 
     if config.get_setting("adult_mode") != 0:
         channel_types.append("adult")
@@ -91,6 +91,14 @@ def getchanneltypes(view="thumb_"):
                              channel_type=channel_type, viewmode="thumbnails",
                              thumbnail=get_thumb("channels_%s.png" % channel_type, view)))
 
+<<<<<<< HEAD
+=======
+    # itemlist.append(Item(title='Oggi in TV', channel="filmontv", action="mainlist", view=view,
+    #                      category=title, channel_type="all", thumbnail=get_thumb("on_the_air.png", view),
+    #                      viewmode="thumbnails")) 
+
+
+>>>>>>> c27d16a6562d27261e946dc55c2dce7d2e33ad1c
     itemlist.append(Item(title=config.get_localized_string(70685), channel="community", action="mainlist", view=view,
                          category=title, channel_type="all", thumbnail=get_thumb("channels_community.png", view),
                          viewmode="thumbnails"))