default-settings: fix conflict
This commit is contained in:
parent
42ab62a21c
commit
30941d692b
@ -56,9 +56,6 @@ sed -i 's/cbi.submit\"] = true/cbi.submit\"] = \"1\"/g' /usr/lib/lua/luci/dispat
|
||||
rm -rf /tmp/luci-modulecache/
|
||||
rm -f /tmp/luci-indexcache
|
||||
|
||||
<<<<<<< HEAD
|
||||
mv /etc/openwrt_banner /etc/banner
|
||||
|
||||
=======
|
||||
>>>>>>> 46fc685ec42e327ffe8b4afd166321eacfd4290a
|
||||
exit 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user