Merge tests and description files

Oscar D. Lara Yejas · Oscar D. Lara Yejas · commit ba091fbc1a9e · 2015-11-06T22:18:12.000Z
diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION
@@ -35,4 +35,4 @@ Collate:
     'sparkR.R'
     'stats.R'
     'types.R'
-    'utils.R'
+    'utils.R'
diff --git a/R/pkg/inst/tests/test_sparkSQL.R b/R/pkg/inst/tests/test_sparkSQL.R
@@ -1468,7 +1468,6 @@ test_that("Method as.data.frame as a synonym for collect()", {
   expect_equal(as.data.frame(irisDF2), collect(irisDF2))
 })
 
-<<<<<<< HEAD
 test_that("attach() on a DataFrame", {
   df <- jsonFile(sqlContext, jsonPath)
   expect_error(age)
