- Sheltered Valley showed signs of an unresolved conflict. Removed the old portion.

This commit is contained in:
jendave
2011-08-06 15:13:43 +00:00
parent 7fa5ebc21a
commit 4101552dce

View File

@@ -1,4 +1,3 @@
<<<<<<< .mine
Name:Sheltered Valley Name:Sheltered Valley
ManaCost:no cost ManaCost:no cost
Types:Land Types:Land
@@ -6,14 +5,5 @@ Text:If CARDNAME would enter the battlefield, instead sacrifice each other perma
A:AB$Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool. A:AB$Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
SVar:Rarity:Rare SVar:Rarity:Rare
SVar:Picture:http://wizards.com/global/images/magic/general/sheltered_valley.jpg SVar:Picture:http://wizards.com/global/images/magic/general/sheltered_valley.jpg
=======
Name:Sheltered Valley
ManaCost:no cost
Types:Land
Text:If CARDNAME would enter the battlefield, instead sacrifice each other permanent named CARDNAME you control, then put CARDNAME onto the battlefield.\r\nAt the beginning of your upkeep, if you control three or fewer lands, you gain 1 life.
K:tap: add 1
SVar:Rarity:Rare
SVar:Picture:http://wizards.com/global/images/magic/general/sheltered_valley.jpg
SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/187.jpg SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/187.jpg
>>>>>>> .r5145
End End