Projects >> mage >>1d4b3a2be65ef95944b79a43a61ded32528e3f80

Chunk
Conflicting content 
import java.util.Random;
import java.util.Set;
import javax.swing.JLayeredPane;
<<<<<<< HEAD
import mage.Constants;
import mage.Mana;
=======

>>>>>>> 179f7200ec4dfe545460063c29e980b486f3f51c
import mage.cards.Card;
import mage.cards.Sets;
import mage.cards.decks.Deck;
Solution content 
import java.util.Random;
import java.util.Set;
import javax.swing.JLayeredPane;
import mage.Mana;
import mage.cards.Card;
import mage.cards.Sets;
import mage.cards.decks.Deck;
File
AddLandDialog.java
Developer's decision
Combination
Kind of conflict
Import