build.sh: delete patch conflict files

Signed-off-by: sbwml <[email protected]>

Author: sbwml

openwrt/build.sh

@@ -246,6 +246,7 @@ bash 03-convert_translation.sh
 bash 04-fix_kmod.sh
 bash 05-fix-source.sh
 [ -f "10-custom.sh" ] && bash 10-custom.sh
+find feeds -type f -name "*.orig" -exec rm -f {} \;
 [ "$(whoami)" = "runner" ] && endgroup
 
 rm -f 0*-*.sh 10-custom.sh

openwrt/patch/odhcpd/luci-mod-network-add-option-for-ipv6-max-plt-vlt.patch

@@ -1,6 +1,6 @@
 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
 +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
-@@ -847,6 +847,20 @@ return view.extend({
+@@ -854,6 +854,20 @@ return view.extend({
  					so.depends('ra', 'server');
  					so.depends({ ra: 'hybrid', master: '0' });