Merge origin/master

This commit is contained in:
fireshoes 2015-08-09 23:04:09 -05:00
commit 4b5401c825
2 changed files with 28 additions and 28 deletions

View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.counters; package mage.counters;
/** /**
@ -88,6 +87,7 @@ public enum CounterType {
VELOCITY("velocity"), VELOCITY("velocity"),
VERSE("verse"), VERSE("verse"),
VILE("vile"), VILE("vile"),
VERSE("verse"),
WISH("wish"); WISH("wish");
private final String name; private final String name;