fix merge

nicolas-grekas · nicolas-grekas · commit 41e7f2ea5f3c · 2019-09-06T16:55:00.000+02:00
diff --git a/Tests/Authentication/AuthenticationTrustResolverTest.php b/Tests/Authentication/AuthenticationTrustResolverTest.php
@@ -139,10 +139,6 @@ public function getRoleNames(): array
     {
     }
 
-    public function getRoleNames(): array
-    {
-    }
-
     public function getCredentials()
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,6 @@ public function getRoleNames(): array`
`139`	`139`	`{`
`140`	`140`	`}`
`141`	`141`
`142`		`- public function getRoleNames(): array`
`143`		`- {`
`144`		`- }`
`145`		`-`
`146`	`142`	`public function getCredentials()`
`147`	`143`	`{`
`148`	`144`	`}`