Update HISTORY.md

liukai · liukai · commit dcea18494847 · 2014-02-06T15:52:16.000-08:00
Remove the unnecessary line led from branch merge.
diff --git 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
