From de88c754e2c4b32a7aae431b081e8bd7c5687887 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 4 May 2026 10:06:05 -0600 Subject: [PATCH] Remove merge conflict markers from switch_core.c --- tests/unit/switch_core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/switch_core.c b/tests/unit/switch_core.c index eaf7082b119..d23dd254a9b 100644 --- a/tests/unit/switch_core.c +++ b/tests/unit/switch_core.c @@ -53,7 +53,6 @@ FST_CORE_BEGIN("./conf") } FST_TEARDOWN_END() -<<<<<<< HEAD FST_TEST_BEGIN(test_switch_regex) {