remove merge conflict after rebase #1067

2017-12-01 08:40:51 +08:00
parent 961629d156
commit 9e0ca51c2f
1 changed files with 0 additions and 1 deletions
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,7 +2,6 @@
 Changelog
 =========

-<<<<<<< HEAD
 dev
 ===
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652