Fix merge issue causing compilation failure.

staple · staple · commit 915b690613b2 · 2014-09-10T16:08:23.000-07:00
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
@@ -665,6 +665,7 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll {
       sql("SELECT key, value FROM testData WHERE key BETWEEN 9 and 7"),
       Seq()
     )
+  }
     
   test("cast boolean to string") {
     // TODO Ensure true/false string letter casing is consistent with Hive in all cases.

Original file line number	Diff line number	Diff line change
`@@ -665,6 +665,7 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll {`
`665`	`665`	`sql("SELECT key, value FROM testData WHERE key BETWEEN 9 and 7"),`
`666`	`666`	`Seq()`
`667`	`667`	`)`
	`668`	`+ }`
`668`	`669`
`669`	`670`	`test("cast boolean to string") {`
`670`	`671`	`// TODO Ensure true/false string letter casing is consistent with Hive in all cases.`