fix: remove merge conflict markers from CodedAsMixedTypesTests.swift

qizh · qizh · commit 161b144f952c · 2026-01-30T16:43:35.000+07:00
Remove leftover merge conflict markers (`&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD, =======, &gt;&gt;&gt;&gt;&gt;&gt;&gt;`) from the test file that were accidentally committed during the previous merge.
diff --git a/Tests/MetaCodableTests/CodedAs/CodedAsMixedTypesTests.swift b/Tests/MetaCodableTests/CodedAs/CodedAsMixedTypesTests.swift
@@ -149,8 +149,6 @@ struct CodedAsMixedTypesTests {
             """
         )
     }
-<<<<<<< HEAD
-=======
 
     /// Tests macro expansion when only `false` is specified for Bool type.
     ///
@@ -291,5 +289,4 @@ struct CodedAsMixedTypesTests {
             """
         )
     }
->>>>>>> bb8f9a5ed (fix: handle partial Bool coverage in TaggedEnumSwitcherVariable)
 }

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,6 @@ struct CodedAsMixedTypesTests {`
`149`	`149`	`"""`
`150`	`150`	`)`
`151`	`151`	`}`
`152`		`-<<<<<<< HEAD`
`153`		`-=======`
`154`	`152`
`155`	`153`	/// Tests macro expansion when only `false` is specified for Bool type.
`156`	`154`	`///`
`@@ -291,5 +289,4 @@ struct CodedAsMixedTypesTests {`
`291`	`289`	`"""`
`292`	`290`	`)`
`293`	`291`	`}`
`294`		`->>>>>>> bb8f9a5ed (fix: handle partial Bool coverage in TaggedEnumSwitcherVariable)`
`295`	`292`	`}`