fix version control conflict
authorFelix Fietkau <nbd@openwrt.org>
Sat, 31 Jan 2009 17:29:08 +0000 (17:29 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 31 Jan 2009 17:29:08 +0000 (17:29 +0000)
commitbad19c3dde12a184ae8c9858625174bc1bc26f26
tree76e4dba5e1aeb59b84bae53d94f10f0548a2eb47
parentff1dac3f476e98605423dfd1f8a9d1660af4bfc2
fix version control conflict

SVN-Revision: 14325
package/mac80211/files/lib/wifi/mac80211.sh