From 17353692ea037a8a321b9e3b762d46c9b588b57e Mon Sep 17 00:00:00 2001 From: Conrad Frame Date: Wed, 11 Dec 2024 10:44:34 -0800 Subject: [PATCH] docs: Remove merge conflict markers --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44fba68919..25923b9ffa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -206,7 +206,6 @@ ================== * feat(model): add throwOnValidationError option for opting into getting MongooseBulkWriteError if all valid operations succeed in bulkWrite() and insertMany() #14599 #14587 #14572 #13410 -<<<<<<< HEAD 8.4.3 / 2024-06-17 ================== * fix: remove 0x flamegraph files from release @@ -219,11 +218,10 @@ * fix(connection): fix up some inconsistencies in operation-end event and add to docs #14659 #14648 * types: avoid inferring Boolean, Buffer, ObjectId as Date in schema definitions under certain circumstances #14667 #14630 * docs: add note about parallelism in transations #14647 [fiws](https://github.com/fiws) -======= + 6.13.1 / 2024-09-06 =================== * fix: remove empty $and, $or, $not that were made empty by scrict mode #14749 #13086 [0x0a0d](https://github.com/0x0a0d) ->>>>>>> 7.x 6.13.0 / 2024-06-06 ===================