WirelessLan/plugin.py: fix merge conflict
[vuplus_dvbapp] / lib / python / Plugins / SystemPlugins / SoftwareManager / __init__.py