From 46923e5ca4fa8a1c83a67741e02df6d67799c2fa Mon Sep 17 00:00:00 2001
From: Ramkumar Vadivelu <ramvadiv@fb.com>
Date: Tue, 17 Nov 2020 14:18:54 -0800
Subject: [PATCH] Fixed a formatting issue in HISTORY.md

---
 HISTORY.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 83066414f..b5d91430a 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,10 +1,4 @@
 # Rocksdb Change Log
-<<<<<<< HEAD
-=======
-## Unreleased
-### Behavior Changes
-* Attempting to write a merge operand without explicitly configuring `merge_operator` now fails immediately, causing the DB to enter read-only mode. Previously, failure was deferred until the `merge_operator` was needed by a user read or a background operation.
-
 ## 6.15.0 (11/13/2020)
 ### Bug Fixes
 * Fixed a bug in the following combination of features: indexes with user keys (`format_version >= 3`), indexes are partitioned (`index_type == kTwoLevelIndexSearch`), and some index partitions are pinned in memory (`BlockBasedTableOptions::pin_l0_filter_and_index_blocks_in_cache`). The bug could cause keys to be truncated when read from the index leading to wrong read results or other unexpected behavior.