fix version control conflict

SVN-Revision: 14325

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 0a3577be85de0d26b259d79e54dae399d3d7972a..279d1d96d6a495950a7833264c014add00e18393 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -50,12 +50,8 @@ enable_mac80211() {
        local device="$1"
        config_get channel "$device" channel
        config_get vifs "$device" vifs
-<<<<<<< HEAD:package/mac80211/files/lib/wifi/mac80211.sh
-       
-=======
        config_get txpower "$device" txpower
 
->>>>>>> ade9976... [package] broadcom,madwifi,mac80211: move txpower from wifi-iface to wifi-device but retain backward compatiblity:package/mac80211/files/lib/wifi/mac80211.sh
        local first=1
        for vif in $vifs; do
                ifconfig "$ifname" down 2>/dev/null