Changeset 14325


Ignore:
Timestamp:
2009-01-31T18:29:08+01:00 (9 years ago)
Author:
nbd
Message:

fix version control conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/package/mac80211/files/lib/wifi/mac80211.sh

    r14312 r14325  
    5151        config_get channel "$device" channel 
    5252        config_get vifs "$device" vifs 
    53 <<<<<<< HEAD:package/mac80211/files/lib/wifi/mac80211.sh 
    54          
    55 ======= 
    5653        config_get txpower "$device" txpower 
    5754 
    58 >>>>>>> ade9976... [package] broadcom,madwifi,mac80211: move txpower from wifi-iface to wifi-device but retain backward compatiblity:package/mac80211/files/lib/wifi/mac80211.sh 
    5955        local first=1 
    6056        for vif in $vifs; do 
Note: See TracChangeset for help on using the changeset viewer.