Merge branch 'erg-planeswalker-typo'

2024-11-21 14:54:45 +00:00 · 2015-12-02 14:02:01 -05:00 · 2015-12-02 14:02:01 -05:00 · c38277efce
commit c38277efce
parent fa4721fb72 a04bbcb34f
2 changed files with 3 additions and 2 deletions
--- a/css/mana.css
+++ b/css/mana.css
@ -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,
--- a/less/loyalty.less
+++ b/less/loyalty.less
@ -1,5 +1,5 @@
 /**
- * Planesalker symbols */
+ * Planeswalker symbols */

 .@{ms-prefix}-loyalty {