mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
fixx
This commit is contained in:
parent
59527a92ff
commit
f2c7328875
1 changed files with 4 additions and 0 deletions
4
build.sh
4
build.sh
|
@ -92,8 +92,12 @@ fi
|
|||
if [ "$OMR_OPENWRT" = "default" ]; then
|
||||
if [ "$OMR_KERNEL" = "5.4" ]; then
|
||||
# Use OpenWrt 21.02 for 5.4 kernel
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "f441be3921c769b732f0148f005d4f1bbace0508"
|
||||
=======
|
||||
get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "f441be3921c769b732f0148f005d4f1bbace0508"
|
||||
>>>>>>> parent of 29611fa (Update build.sh)
|
||||
_get_repo feeds/packages https://github.com/openwrt/packages "3aa30ceee4fcf7b131bdc0f98658391069573e12"
|
||||
_get_repo feeds/luci https://github.com/openwrt/luci "f28aaa35cd5c0cbbe59d8cc6a67de88ceeac382e"
|
||||
=======
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue