Fix merge

Author: tvdijen

tests/XMLSchema/Type/Helper/XPathValueTest.php

@@ -4,10 +4,7 @@
 
 namespace SimpleSAML\Test\XMLSchema\Type\Builtin;
 
-<<<<<<< HEAD
 use Error;
-=======
->>>>>>> release-3.x
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -32,11 +29,7 @@ public function testString(bool $shouldPass, string $xpath): void
         try {
             $value = XPathValue::fromString($xpath);
             $this->assertTrue($shouldPass);
-<<<<<<< HEAD
         } catch (Error) {
-=======
-        } catch (AssertionFailedException $e) {
->>>>>>> release-3.x
             $this->assertFalse($shouldPass);
         }
     }