shengjun.li 257ea7782f
fix merge result (#2463)
* fix merge result

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>

* fix tests

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
2020-06-01 07:31:58 +00:00
..
2020-05-12 18:13:05 +08:00