Resolve merge conflicts

src/main/resources/reference.conf

 tpcds {
-	scaleFactor = 1
-	dataLocation = "hdfs://127.0.0.1:9000/tpcds"
+	scaleFactor = 100
+	dataLocation = "hdfs://namenode:9000/tpcds100"
 	dataFormat = "parquet"
 	overwrite = false
-	partitionTables = false
+	partitionTables = true
 	useDoubleForDecimal = false
 	clusterByPartitionColumns = false
 	filterOutNullPartitionValues = false
-}
\ No newline at end of file
+}

src/main/scala/com/databricks/spark/sql/perf/tpcds/Tables.scala

@@ -113,7 +113,7 @@ class Tables(sqlContext: SQLContext, scaleFactor: Int) extends Serializable {
         overwrite: Boolean,
         clusterByPartitionColumns: Boolean,
         filterOutNullPartitionValues: Boolean): Unit = {
-      println(s"Begin genData for table $name in database to $location with save mode $mode")
+      println(s"Begin genData for table $name in database to $location")
       val mode = if (overwrite) SaveMode.Overwrite else SaveMode.Ignore
 
       val data = df(format != "text")