remove a conflict line in the op_shape_test.cpp file

17984330 · Shucai Xiao · 0b12d3c7 · 17984330
Commit 17984330 authored Feb 28, 2019 by Shucai Xiao
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

test/op_shape_test.cpp test/op_shape_test.cpp +0 -1

No files found.
--- a/test/op_shape_test.cpp
+++ b/test/op_shape_test.cpp
@@ -316,7 +316,6 @@ TEST_CASE(gather)
    }
 }
-<<<<<<< HEAD
 TEST_CASE(dot)
 {
    {