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)
commit3a5c33fee95e302e5df8b6d5533f44fac9d83c04
tree3fb5f9cebbc537661d7ed64aa2e771f7cd363cf7
parent6b2ab5e1f4fb43df85ec3f34a213ae9d7e3ad898
fix version control conflict

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