From bb23fea8e2e55f7b60d2221b247930ddfff6f8be Mon Sep 17 00:00:00 2001 From: Anael Orlinski Date: Wed, 15 Nov 2023 21:23:07 +0100 Subject: [PATCH] Fix 02_prepare_openwrt_folder.sh --- openwrt-23.05/steps/02_prepare_openwrt_folder.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/openwrt-23.05/steps/02_prepare_openwrt_folder.sh b/openwrt-23.05/steps/02_prepare_openwrt_folder.sh index 8ee5a9a..0818e2c 100755 --- a/openwrt-23.05/steps/02_prepare_openwrt_folder.sh +++ b/openwrt-23.05/steps/02_prepare_openwrt_folder.sh @@ -10,15 +10,9 @@ cd "$ROOTDIR/build" cp -R openwrt-fresh-23.05 openwrt -<<<<<<< HEAD -# freeze revision to 23.05.0 -cd openwrt -git reset --hard bd4f415efacfc03bbe5b79ae1d39c1451f5f7385 -======= # freeze revision to 23.05.2 cd openwrt git reset --hard 1c26bcb10819f072964a658e2cc29bb87613a6f5 ->>>>>>> 108fda3 (openwrt 23.05.2) echo "Current OpenWRT commit" git log -1