tests: remove leftover merge conflict marker

I501307 · I501307 · commit bc5afb888dc1 · 2026-01-21T15:18:13.000+01:00
Signed-off-by: Jesse Awan &lt;jesse.awan@sap.com&gt;
diff --git a/tests/runtime/in_kubernetes_events.c b/tests/runtime/in_kubernetes_events.c
@@ -515,7 +515,6 @@ void flb_test_events_with_chunkedrecv()
     test_ctx_destroy(ctx);
 }
 
-<<<<<<< HEAD
 #ifdef FLB_HAVE_SQLDB
 /* Test valid db.sync values */
 void flb_test_config_db_sync_values()

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,6 @@ void flb_test_events_with_chunkedrecv()`
`515`	`515`	`test_ctx_destroy(ctx);`
`516`	`516`	`}`
`517`	`517`
`518`		`-<<<<<<< HEAD`
`519`	`518`	`#ifdef FLB_HAVE_SQLDB`
`520`	`519`	`/* Test valid db.sync values */`
`521`	`520`	`void flb_test_config_db_sync_values()`