follow up from @wesm comments on apache#2489

romainfrancois · Sep 10, 2018 · fde31b3 · fde31b3
1 parent 2f97f00
commit fde31b3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 219 deletions.
diff --git a/r/DESCRIPTION b/r/DESCRIPTION
@@ -1,5 +1,6 @@
 Package: arrow
 <<<<<<< HEAD
+<<<<<<< HEAD
 Title: R Integration to 'Apache' 'Arrow'
 Version: 0.0.0.9000
 Authors@R: c(
@@ -9,12 +10,20 @@ Authors@R: c(
 Description: R Integration to 'Apache' 'Arrow'.
 =======
 Title: Bindings to 'Apache' 'Arrow'
+=======
+Title: R Integration to 'Apache' 'Arrow'
+>>>>>>> follow up from @wesm comments on #2489
 Version: 0.0.0.9000
 Authors@R: c(
-    person("Romain", "François", email = "[email protected]", role = c("aut", "cre"))
+    person("Romain", "François", email = "[email protected]", role = c("aut", "cre")), 
+    person("Apache Arrow", email = "[email protected]", role = c("aut", "cph"))
   )
+<<<<<<< HEAD
 Description: R bindings to Apache Arrow.
 >>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32()
+=======
+Description: R Integration to 'Apache' 'Arrow'.
+>>>>>>> follow up from @wesm comments on #2489
 Depends: R (>= 3.5)
 License: Apache License (>= 2.0)
 Encoding: UTF-8

diff --git a/r/LICENSE.md b/r/LICENSE.md
diff --git a/r/src/hello.cpp b/r/src/hello.cpp
@@ -15,8 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <Rcpp.h>
-#include "rrrow_types.h"
+#include "r_arrow_types.h"
 
 using namespace Rcpp ;
 using namespace arrow ;

diff --git a/r/src/rrrow_types.h b/r/src/rrrow_types.h