X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/defadb893d6897935165b63a9de09b95f43dfcc1..e03708b0a361c236d7034f35e4585edd4a91bb34:/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index 6bfaec52..6873ffa4 100755
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@ -262,11 +262,6 @@ class WlanScan(Screen):
 		self.updateAPList()
 
 	def buildEntryComponent(self, essid, bssid, encrypted, iface, maxrate, signal):
-<<<<<<< HEAD:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
-		print "buildEntryComponent",essid
-		print "buildEntryComponent",bssid
-=======
->>>>>>> origin/bug_203_fix_wrong_networkstate:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
 		divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/div-h.png"))
 		encryption = encrypted and _("Yes") or _("No")
 		if bssid == 'hidden...':
@@ -399,4 +394,3 @@ def configStrings(iface):
 
 def Plugins(**kwargs):
 	return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "WlanPluginEntry": lambda x: "Wireless Network Configuartion..."})
-	
\ No newline at end of file