Fixed mistake during merge to branch-0.19

rapidsai · Feb 25, 2021 · 9c1b466 · 9c1b466
1 parent 6259a0b
commit 9c1b466
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/cpp/test/prims/sparse/knn.cu b/cpp/test/prims/sparse/knn.cu
@@ -166,12 +166,8 @@ const std::vector<SparseKNNInputs<int, float>> inputs_i32_f = {
    {0, 3, 1, 0, 2, 0, 3, 0},                          // inds
    2,
    2,
-<<<<<<< HEAD
-   raft::distance::DistanceType::L2SqrtExpanded}};
-=======
    2,
-   ML::MetricType::METRIC_L2}};
->>>>>>> branch-0.19
+   raft::distance::DistanceType::L2SqrtExpanded}};
 typedef SparseKNNTest<int, float> KNNTestF;
 TEST_P(KNNTestF, Result) { compare(); }
 INSTANTIATE_TEST_CASE_P(SparseKNNTest, KNNTestF,