Remove merge conflict markers from switch_core.c (#16)

markjcrane · web-flow · commit 13434d537734 · 2026-05-04T10:09:38.000-06:00
diff --git 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)
 		{

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ FST_CORE_BEGIN("./conf")`
`53`	`53`	`}`
`54`	`54`	`FST_TEARDOWN_END()`
`55`	`55`
`56`		`-<<<<<<< HEAD`
`57`	`56`
`58`	`57`	`FST_TEST_BEGIN(test_switch_regex)`
`59`	`58`	`{`