add changelog into dev #1067

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

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