Update HISTORY.md
Remove the unnecessary line led from branch merge.
This commit is contained in:
parent
4564b2e8f9
commit
dcea184948
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user