From bad19c3dde12a184ae8c9858625174bc1bc26f26 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 31 Jan 2009 17:29:08 +0000 Subject: [PATCH] fix version control conflict SVN-Revision: 14325 --- package/mac80211/files/lib/wifi/mac80211.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 0a3577be85..279d1d96d6 100644 --- 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 -- 2.30.2