From 7149ecd2ddd0b51b051b36817026a5bf7605463d Mon Sep 17 00:00:00 2001
From: MarcoMarin <Ghost@64bots>
Date: Mon, 11 Apr 2016 17:26:32 -0300
Subject: [PATCH] oubliette difference is blocking me from pulls from origin2

---
 Mage.Sets/src/mage/sets/arabiannights/Oubliette.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java b/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java
index d072fcd8a22..6c6b2c2e6e5 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/Oubliette.java
@@ -222,11 +222,7 @@ class OublietteReturnEffect extends OneShotEffect {
                 }
                 if (oubliette == null) return false;//1st stab at getting those counters back
                 for(Counter c : ((Oubliette)oubliette).godHelpMe.values()){ //would be nice if could just use that copy function to set the whole field
-<<<<<<< HEAD
-                    if(c!=null) newPermanent.getCounters(game).addCounter(c);
-=======
-                    newPermanent.getCounters(game).addCounter(c);
->>>>>>> 013c506facb3e0cdc381116053e4fc7e90b17a42
+                    if(c!=null) newPermanent.getCounters(game).addCounter(c);                    
                 }
                     
             }