WirelessLan/plugin.py: fix merge conflict
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:17:35 +0000 (07:17 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:17:35 +0000 (07:17 +0100)
commit5808051426cab03a0dc117c73b941b0afb05a87d
treec7dd1bc3417d85d7e3628c2a3a04db5f83f3ca29
parent786a5a906d13ec5832fbecf5c4fa5421f2cac790
WirelessLan/plugin.py: fix merge conflict
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py