From 4a9137bf000491fc065ac77c8d73d6aa87f72d5e Mon Sep 17 00:00:00 2001 From: Matthias Wientapper Date: Mon, 26 Jan 2026 12:47:35 +0100 Subject: [PATCH] Remove PR-1199 as its functionality is part of dev now --- fetch_prs.sh | 2 -- merge_prs.sh | 1 - 2 files changed, 3 deletions(-) diff --git a/fetch_prs.sh b/fetch_prs.sh index 6a70f43f..2dd6a197 100755 --- a/fetch_prs.sh +++ b/fetch_prs.sh @@ -1,10 +1,8 @@ #!/bin/sh -git branch -D pr-1199 git branch -D pr-1297 git branch -D pr-1338 # fetch PRs git fetch upstream pull/1338/head:pr-1338 git fetch upstream pull/1297/head:pr-1297 -git fetch upstream pull/1199/head:pr-1199 diff --git a/merge_prs.sh b/merge_prs.sh index 42d14059..338b2f81 100755 --- a/merge_prs.sh +++ b/merge_prs.sh @@ -2,7 +2,6 @@ git merge pr-1338 --no-edit -m "Integration of upstrem PR #1338" git merge pr-1297 --no-edit -m "Integration of upstrem PR #1297" -git merge pr-1199 --no-edit -m "Integration of upstrem PR #1199" git merge pio-ini-adjustments -m "platformio.ini: Adjust defaults for LoRa frequncies and advert interval limits"