From 30941d692bd467993c3fb1b0fefc9429638f7322 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 22 Jan 2020 18:42:22 +0800 Subject: [PATCH] default-settings: fix conflict --- package/lean/default-settings/files/zzz-default-settings | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index b11a3a6d64..b3abc87727 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -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