remove merge conflict after rebase #1067

This commit is contained in:
Erdenezul 2017-12-01 08:40:51 +08:00
parent 961629d156
commit 9e0ca51c2f

View File

@ -2,7 +2,6 @@
Changelog Changelog
========= =========
<<<<<<< HEAD
dev dev
=== ===
- Subfield resolve error in generic_emdedded_document query #1651 #1652 - Subfield resolve error in generic_emdedded_document query #1651 #1652