Update HISTORY.md

Remove the unnecessary line led from branch merge.

Update HISTORY.md
Remove the unnecessary line led from branch merge.
dcea1849 · Kai Liu · 4564b2e8 · dcea1849
隐藏空白更改
内联并排

Showing with 0 addition and 2 deletion

HISTORY.md HISTORY.md +0 -2

未找到文件。
--- 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