Remove PR-1199 as its functionality is part of dev now

This commit is contained in:
Matthias Wientapper
2026-01-26 12:47:35 +01:00
parent 0d528f71dd
commit 614c8e6d52
2 changed files with 0 additions and 3 deletions

View File

@@ -1,10 +1,8 @@
#!/bin/sh #!/bin/sh
git branch -D pr-1199
git branch -D pr-1297 git branch -D pr-1297
git branch -D pr-1338 git branch -D pr-1338
# fetch PRs # fetch PRs
git fetch upstream pull/1338/head:pr-1338 git fetch upstream pull/1338/head:pr-1338
git fetch upstream pull/1297/head:pr-1297 git fetch upstream pull/1297/head:pr-1297
git fetch upstream pull/1199/head:pr-1199

View File

@@ -2,7 +2,6 @@
git merge pr-1338 --no-edit -m "Integration of upstrem PR #1338" 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-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" git merge pio-ini-adjustments -m "platformio.ini: Adjust defaults for LoRa frequncies and advert interval limits"