toDebugString: prettier debug printing to show shuffles and joins mor…

…e clearly
xiliu82 · Jul 21, 2014 · 08f5c78 · 08f5c78
1 parent 1603f7b
commit 08f5c78
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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") =>