From 9dfa4e77442ef8c92c0f9d582594c4b5e7a2a574 Mon Sep 17 00:00:00 2001
From: witgo <witgo@qq.com>
Date: Fri, 16 May 2014 14:00:55 +0800
Subject: [PATCH] merge bug

---
 .../org/apache/spark/sql/parquet/ParquetQuerySuite.scala    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala
index cd58e5c0e675a..341d55e21c9a9 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala
@@ -42,9 +42,6 @@ import org.apache.spark.sql.test.TestSQLContext._
 
 case class TestRDDEntry(key: Int, value: String)
 
-<<<<<<< HEAD
-class ParquetQuerySuite extends QueryTest with FunSuiteLike with BeforeAndAfterAll {
-=======
 case class NullReflectData(
     intField: java.lang.Integer,
     longField: java.lang.Long,
@@ -59,8 +56,7 @@ case class OptionalReflectData(
     doubleField: Option[Double],
     booleanField: Option[Boolean])
 
-class ParquetQuerySuite extends QueryTest with FunSuite with BeforeAndAfterAll {
->>>>>>> a20fea98811d98958567780815fcf0d4fb4e28d4
+class ParquetQuerySuite extends QueryTest with FunSuiteLike with BeforeAndAfterAll {
   import TestData._
   TestData // Load test data tables.