Remove PR-1199 as its functionality is part of dev now
This commit is contained in:
@@ -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
|
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user