Revert "Merge branch 'master' into 'master'"

This reverts merge request !2334
This commit is contained in:
Myrd
2019-12-20 15:48:04 +00:00
parent b7c4720030
commit 5cb8502566
8 changed files with 33 additions and 33 deletions

View File

@@ -481,7 +481,7 @@ public class PlayerControllerForTests extends PlayerController {
}
@Override
public String chooseSomeType(String kindOfType, SpellAbility sa, Collection<String> validTypes, List<String> invalidTypes, boolean isOptional) {
public String chooseSomeType(String kindOfType, SpellAbility sa, List<String> validTypes, List<String> invalidTypes, boolean isOptional) {
return chooseItem(validTypes);
}