Skip to content

Commit 7f1c7e2

Browse files
committed
Merge branch 'implement_rules' of https://github.com/laura-codess/aws-toolkit-vscode into implement_rules
2 parents 4ce7a85 + 4b4bb07 commit 7f1c7e2

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

packages/toolkit/CHANGELOG.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
## 3.71.0 2025-08-06
32

43
- Miscellaneous non-user-facing changes
@@ -7,8 +6,6 @@
76

87
- **Feature** Improved connection actions for SSO
98

10-
=======
11-
>>>>>>> 9c36413c8 (Merge master into feature/ui-e2e-tests (#7680))
129
## 3.69.0 2025-07-16
1310

1411
- **Bug Fix** SageMaker: Enable per-region manual filtering of Spaces

0 commit comments

Comments
 (0)