Commit 52ac3336 authored by 王翔宇's avatar 王翔宇
Browse files

solve conflicts


Former-commit-id: 868f086635e693def511631fcd10d6c0515a5556
parent bf20a699
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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