resolving conflicts

romainfrancois · romainfrancois · commit 110b00d24661 · 2018-09-24T20:15:02.000+02:00
diff --git a/r/R/R6.R b/r/R/R6.R
@@ -295,52 +295,6 @@ date32 <- function() `arrow::Date32`$new(Date32_initialize())
 date64 <- function() `arrow::Date64`$new(Date64_initialize())
 
 #' @rdname DataType
-
-#' @export
-int8 <- function() `arrow::Int8`$new()
-
-#' @export
-int16 <- function() `arrow::Int16`$new()
-
-#' @export
-int32 <- function() `arrow::Int32`$new()
-
-#' @export
-int64 <- function() `arrow::Int64`$new()
-
-#' @export
-uint8 <- function() `arrow::UInt8`$new()
-
-#' @export
-uint16 <- function() `arrow::UInt16`$new()
-
-#' @export
-uint32 <- function() `arrow::UInt32`$new()
-
-#' @export
-uint64 <- function() `arrow::UInt64`$new()
-
-#' @export
-float16 <- function() `arrow::Float16`$new()
-
-#' @export
-float32 <- function() `arrow::Float32`$new()
-
-#' @export
-float64 <- function() `arrow::Float64`$new()
-
-#' @export
-boolean <- function() `arrow::Boolean`$new()
-
-#' @export
-utf8 <- function() `arrow::Utf8`$new()
-
-#' @export
-date32 <- function() `arrow::Date32`$new()
-
-#' @export
-date64 <- function() `arrow::Date64`$new()
-
 #' @export
 time32 <- function(unit) {
   `arrow::Time32`$new(Time32_initialize(unit))
@@ -365,16 +319,6 @@ timestamp <- function(unit, timezone) {
 }
 
 #' @rdname DataType
-
-#' @export
-time64 <- function(unit) `arrow::Time64`$new(unit)
-
-#' @export
-null <- function() `arrow::Null`$new()
-
-#' @export
-timestamp <- function(...) `arrow::Timestamp`$new(...)
-
 #' @export
 decimal <- function(precision, scale) `arrow::Decimal128Type`$new(Decimal128Type_initialize(precision, scale))
 
diff --git a/r/data-raw/test.R b/r/data-raw/test.R
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 library(tidyverse)
 library(arrow)
 
diff --git a/r/man/DataType.Rd b/r/man/DataType.Rd
