chore(deps-dev): bump @types/node from 20.11.0 to 20.11.2 (#1912)

aws-powertools · Feb 20, 2024 · 51bc6f4 · 51bc6f4
1 parent 0f81306
commit 51bc6f4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/maintainers.md b/docs/maintainers.md
@@ -160,11 +160,7 @@ Some examples using our initial and new RFC templates: [#447](https://github.com
 
 ### Releasing a new version
 
-<<<<<<< HEAD
 Firstly, make sure all the PRs that you want to include in the release are merged into the `main` branch.
-=======
-Firstly, make sure all the PRs that you want to include in the release are merged into the `main` banch.
->>>>>>> d20269dd (docs(maintenance): add processes tab (#1747))
 
 Next, run the integration tests one last time to make sure everything is working as expected. See [Run end to end tests](#run-end-to-end-tests) for more details.