From dcea18494847a482c2674ef4f6e1e1b562dae400 Mon Sep 17 00:00:00 2001
From: Kai Liu <hfevers@gmail.com>
Date: Thu, 6 Feb 2014 15:52:16 -0800
Subject: [PATCH] Update HISTORY.md

Remove the unnecessary line led from branch merge.
---
 HISTORY.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index d0f558545..102031b15 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -7,8 +7,6 @@
 * Removed arena.h from public header files.
 * By default, checksums are verified on every read from database
 
->>>>>>> master
-
 ## 2.7.0 (01/28/2014)
 
 ### Public API changes