Fix conflicts

apache · Jul 6, 2015 · feb1129 · feb1129
2 parents 92ed7a6 + 1e82316
commit feb1129
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveUDFSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveUDFSuite.scala
@@ -140,8 +140,8 @@ class HiveUDFSuite extends QueryTest {
     intercept[AnalysisException] {
       sql("SELECT testUDFToListString(s) FROM inputTable")
     }
-    sql("DROP TEMPORARY FUNCTION IF EXISTS testUDFToListString")
 
+    sql("DROP TEMPORARY FUNCTION IF EXISTS testUDFToListString")
     TestHive.reset()
   }
 
@@ -153,8 +153,8 @@ class HiveUDFSuite extends QueryTest {
     intercept[AnalysisException] {
       sql("SELECT testUDFToListInt(s) FROM inputTable")
     }
-    sql("DROP TEMPORARY FUNCTION IF EXISTS testUDFToListInt")
 
+    sql("DROP TEMPORARY FUNCTION IF EXISTS testUDFToListInt")
     TestHive.reset()
   }