Diff for "Bluestar" - Wiki of Yore

Differences between revisions 30 and 33 (spanning 3 versions)

$/!\$ Edit conflict - other version:

Bluestar the Brilliant,Little Pony Unicorn,7 Crafting 1997 AE - 19 Seeds 2835 AE,Ensconced Archmage\, Wizard-prince
Species	${species}
Gender	${gender}
Lived	${lived}
Occupation	${occupation}
Affiliation	${affiliation}
GM Notes

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

Bluestar the Brilliant
Species	Little Pony
Type	Unicorn
Lived	7 Crafting 1997 AE - 19 Seeds 2835 AE
Occupation	Ensconced Archmage, Wizard-prince
Affiliation	Ponyland pre-catastrophe, later New Equestria
Special Talent	Life-extension magic
Ensconced Archmage of the Isle of Yore
Tenure	14 Rain 2042 AE - 19 Seeds 2835 AE
Predecessor	Unspecified
Successor	None
Ruler of New Equestria
Tenure	ca. 2080 AE - 19 Seeds 2835 AE
Predecessor	Position Created
Successor	Ephemeris, Queen of New Equestria

Bluestar the Brilliant was historical archmage, who founded New Canterlot as a cloistered wizard-state around his tower on the Isle of Yore. Bluestar was incredibly talented in magical life extension.

-  ⇤ ← Revision 30 as of 2014-05-03 22:09:48 → 
  Size: 1155
  Editor: Bryce
  Comment:
+   ← Revision 33 as of 2014-05-03 22:12:07 → ⇥
  Size: 1451
  Editor: Bryce
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-<<Card(CardCharacter Bluestar the Brilliant,[[Little Pony]] [[Unicorn]],7 Crafting 1997 AE - 19 Seeds 2835 AE,"[[Ensconced Archmage]], [[Wizard-prince]]")>>
+---- /!\ '''Edit conflict - other version:''' ----
<<Card(Character Bluestar the Brilliant,[[Little Pony]] [[Unicorn]],7 Crafting 1997 AE - 19 Seeds 2835 AE,[[Ensconced Archmage]]\, [[Wizard-prince]])>>

---- /!\ '''Edit conflict - your version:''' ----
<<Card(Character Bluestar the Brilliant|[[Little Pony]] [[Unicorn]]|7 Crafting 1997 AE - 19 Seeds 2835 AE|[[Ensconced Archmage]], [[Wizard-prince]])>>

---- /!\ '''End of edit conflict''' ----