Remove unresolved merge markers

safranowith · safranowith · commit f340abc769d8 · 2025-10-15T12:33:15.000+03:00
diff --git a/ggml/include/ggml.h b/ggml/include/ggml.h
@@ -1156,7 +1156,6 @@ extern "C" {
             struct ggml_context * ctx,
             struct ggml_tensor  * a);
 
-<<<<<<< HEAD
     GGML_API struct ggml_tensor * ggml_floor(
             struct ggml_context * ctx,
             struct ggml_tensor  * a);
diff --git a/ggml/src/ggml-cpu/ops.cpp b/ggml/src/ggml-cpu/ops.cpp
@@ -8993,7 +8993,6 @@ void ggml_compute_forward_unary(
             {
                 ggml_compute_forward_exp(params, dst);
             } break;
-<<<<<<< HEAD
         case GGML_UNARY_OP_FLOOR:
             {
                 ggml_compute_forward_floor(params, dst);

Original file line number	Diff line number	Diff line change
`@@ -8993,7 +8993,6 @@ void ggml_compute_forward_unary(`
`8993`	`8993`	`{`
`8994`	`8994`	`ggml_compute_forward_exp(params, dst);`
`8995`	`8995`	`} break;`
`8996`		`-<<<<<<< HEAD`
`8997`	`8996`	`case GGML_UNARY_OP_FLOOR:`
`8998`	`8997`	`{`
`8999`	`8998`	`ggml_compute_forward_floor(params, dst);`