From 08f5c787781df159bb4c06bcc753e724e725af56 Mon Sep 17 00:00:00 2001
From: Gregory Owen <greowen@gmail.com>
Date: Thu, 10 Jul 2014 16:10:21 -0700
Subject: [PATCH] toDebugString: prettier debug printing to show shuffles and
 joins more clearly

---
 project/MimaExcludes.scala | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index 98443e58b96f2..4d86e1a0d8bbf 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -31,7 +31,6 @@ import com.typesafe.tools.mima.core._
  * MimaBuild.excludeSparkClass("graphx.util.collection.GraphXPrimitiveKeyOpenHashMap")
  */
 object MimaExcludes {
-<<<<<<< HEAD
 
   def excludes(version: String) = version match {
     case v if v.startsWith("1.1") =>