Merge branch 'master' into master

This commit is contained in:
spjspj 2017-12-10 21:54:02 +10:00 committed by GitHub
commit f5d16a930f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 200 additions and 22 deletions

View file

@ -12,7 +12,7 @@ public class TxtDeckImporterTest {
@Test
public void testImportWithBlankLineAboveSideboard() {
TxtDeckImporter importer = new TxtDeckImporter();
TxtDeckImporter importer = new TxtDeckImporter(false);
CardInfo card;
DeckCardLists deck = new DeckCardLists();