From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 31 Jan 2009 17:29:08 +0000 (+0000)
Subject: fix version control conflict
X-Git-Tag: 8.09~8
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=bad19c3dde12a184ae8c9858625174bc1bc26f26;p=openwrt%2Fsvn-archive%2Fopenwrt.git

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 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