RUM-12441 Fix merge conflicts

barboraplasovska · barboraplasovska · commit 264acfe2edb4 · 2025-11-12T17:18:08.000+01:00
diff --git a/DatadogRUM/Tests/Instrumentation/Resources/URLSessionRUMResourcesHandlerTests.swift b/DatadogRUM/Tests/Instrumentation/Resources/URLSessionRUMResourcesHandlerTests.swift
@@ -1183,7 +1183,6 @@ class URLSessionRUMResourcesHandlerTests: XCTestCase {
 
         XCTAssertNil(stopResourceCommand?.attributes[CrossPlatformAttributes.graphqlErrors])
     }
-    }
 
     // MARK: - Helper Methods
 

Original file line number	Diff line number	Diff line change
`@@ -1183,7 +1183,6 @@ class URLSessionRUMResourcesHandlerTests: XCTestCase {`
`1183`	`1183`
`1184`	`1184`	`XCTAssertNil(stopResourceCommand?.attributes[CrossPlatformAttributes.graphqlErrors])`
`1185`	`1185`	`}`
`1186`		`- }`
`1187`	`1186`
`1188`	`1187`	`// MARK: - Helper Methods`
`1189`	`1188`