default-settings: fix conflict

This commit is contained in:
CN_SZTL 2020-01-22 18:42:22 +08:00
parent 42ab62a21c
commit 30941d692b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176

View File

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