resloved conflict

Author: safranowith

tests/test-backend-ops.cpp

@@ -6771,10 +6771,6 @@ static std::vector<std::unique_ptr<test_case>> make_test_cases_eval() {
         test_cases.emplace_back(new test_ceil      (type, {7, 1, 5, 3}));
         test_cases.emplace_back(new test_round     (type, {7, 1, 5, 3}));
         test_cases.emplace_back(new test_trunc     (type, {7, 1, 5, 3}));
-<<<<<<< HEAD
-=======
-
->>>>>>> 9fef9eefb (add tests)
     }
 
     test_cases.emplace_back(new test_diag_mask_inf(GGML_TYPE_F32, {10, 10, 1, 1}, 5));