Skip to content

Commit 51bc6f4

Browse files
dependabot[bot]dreamorosi
authored andcommitted
chore(deps-dev): bump @types/node from 20.11.0 to 20.11.2 (#1912)
1 parent 0f81306 commit 51bc6f4

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

Diff for: docs/maintainers.md

-4
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,7 @@ Some examples using our initial and new RFC templates: [#447](https://github.com
160160

161161
### Releasing a new version
162162

163-
<<<<<<< HEAD
164163
Firstly, make sure all the PRs that you want to include in the release are merged into the `main` branch.
165-
=======
166-
Firstly, make sure all the PRs that you want to include in the release are merged into the `main` banch.
167-
>>>>>>> d20269dd (docs(maintenance): add processes tab (#1747))
168164

169165
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.
170166

0 commit comments

Comments
 (0)