diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 07:17:35 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 07:17:35 +0100 |
| commit | 5808051426cab03a0dc117c73b941b0afb05a87d (patch) | |
| tree | c7dd1bc3417d85d7e3628c2a3a04db5f83f3ca29 /lib/python | |
| parent | 786a5a906d13ec5832fbecf5c4fa5421f2cac790 (diff) | |
| download | enigma2-5808051426cab03a0dc117c73b941b0afb05a87d.tar.gz enigma2-5808051426cab03a0dc117c73b941b0afb05a87d.zip | |
WirelessLan/plugin.py: fix merge conflict
Diffstat (limited to 'lib/python')
| -rwxr-xr-x | lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py | 5 |
1 files changed, 0 insertions, 5 deletions
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...': |