solve conflicts

Former-commit-id: 538671361c228898d0f2a81fdfdd7d3087bf0721
This commit is contained in:
wxyu 2019-10-28 19:23:05 +08:00
parent a3c369c076
commit ada0bf86ce

View File

@ -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