aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ecccd64e..e7acbe0a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@
- Bugfix: Add explicit lambda capture in CasContainer::IterateChunks to avoid accessing state data references
- Bugfix: Validate compact binary objects stored in cache before attempting to parse them to avoid crash when data is corrupt
- Bugfix: Don't report redundant error if disk is full when writing GC state or GC log
-<<<<<<< HEAD
- Bugfix: Add explicit lambda capture in CasContainer::IterateChunks to avoid accessing state data references
- Bugfix: Validate compact binary objects stored in cache before attempting to parse them to avoid crash when data is corrupt
- Bugfix: Don't report redundant error if disk is full when writing GC state or GC log