From: acid-burn <acid-burn@opendreambox.org>
Date: Wed, 23 Dec 2009 06:17:35 +0000 (+0100)
Subject: WirelessLan/plugin.py: fix merge conflict
X-Git-Tag: 2.7.0~32^2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/5808051426cab03a0dc117c73b941b0afb05a87d

WirelessLan/plugin.py: fix merge conflict
---

diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index c71037c5..c8568b98 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
-=======
->>>>>>> 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...':