Merge origin/master

This commit is contained in:
fireshoes 2017-04-18 21:15:41 -05:00
commit c88584b619

View file

@ -322,9 +322,6 @@ public class NewTournamentDialog extends MageDialog {
btnOk.setText("OK");
btnOk.addActionListener(evt -> btnOkActionPerformed(evt));
btnOk.setText("OK");
btnOk.addActionListener(evt -> btnOkActionPerformed(evt));
btnCancel.setText("Cancel");
btnCancel.addActionListener(evt -> btnCancelActionPerformed(evt));