From 9e0ca51c2f47618b539c2724ecfe656e454eb062 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Fri, 1 Dec 2017 08:40:51 +0800
Subject: [PATCH] remove merge conflict after rebase #1067

---
 docs/changelog.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1bd932d6..efd2e0f6 100644
--- 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