Skip to content

Commit 57ca1a0

Browse files
authored
Merge branch 'master' into esp-idf-v5.1
2 parents 32acbb7 + 8c244e1 commit 57ca1a0

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
.vscode
3+
managed_components/
34
components/arduino/
45
components/esp-dl/
56
components/esp-sr/

tools/config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [ -z $IDF_BRANCH ]; then
1010
fi
1111

1212
if [ -z $AR_PR_TARGET_BRANCH ]; then
13-
AR_PR_TARGET_BRANCH="master"
13+
AR_PR_TARGET_BRANCH="release/v2.x"
1414
fi
1515

1616
if [ -z $IDF_TARGET ]; then

0 commit comments

Comments
 (0)