Merge branch 'erg-planeswalker-typo'

This commit is contained in:
Andrew Gioia 2015-12-02 14:02:01 -05:00
commit c38277efce
2 changed files with 3 additions and 2 deletions

View File

@ -395,6 +395,7 @@
left: 1.0em;
}
/**
<<<<<<< HEAD
* Half costs */
.ms-half {
width: .675em;
@ -406,7 +407,7 @@
margin-left: -0.675em;
}
/**
* Planesalker symbols */
* Planeswalker symbols */
.ms-loyalty-up,
.ms-loyalty-down,
.ms-loyalty-zero,

View File

@ -1,5 +1,5 @@
/**
* Planesalker symbols */
* Planeswalker symbols */
.@{ms-prefix}-loyalty {