From ada0bf86ce2504fffe1edb0ce49282f2074d383c Mon Sep 17 00:00:00 2001
From: wxyu <xy.wang@zilliz.com>
Date: Mon, 28 Oct 2019 19:23:05 +0800
Subject: [PATCH] solve conflicts

Former-commit-id: 538671361c228898d0f2a81fdfdd7d3087bf0721
---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 064ad9b439..cc2461a9c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,6 @@ Please mark all change in change log and use the ticket from JIRA.
 - \#96 - Remove .a file in milvus/lib for docker-version
 - \#118 - Using shared_ptr instead of weak_ptr to avoid performance loss
 
->>>>>>> main/0.5.1
 ## Feature
 - \#115 - Using new structure for tasktable