+ installation instructions

apache · Sep 24, 2018 · 36e9801 · 36e9801
1 parent 108caf9
commit 36e9801
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
@@ -120,20 +120,11 @@ c_glib/doc/reference/gtk-doc.make
 *.scss
 r/R/RcppExports.R
 r/src/RcppExports.cpp
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> not checking for headers on these files
 r/DESCRIPTION
 r/LICENSE.md
 r/NAMESPACE
 r/.Rbuildignore
 r/arrow.Rproj
-<<<<<<< HEAD
 r/README.md
 r/README.Rmd
 r/man/*.Rd
-=======
->>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32()
-=======
->>>>>>> not checking for headers on these files
diff --git a/r/.Rbuildignore b/r/.Rbuildignore
@@ -1,9 +1,6 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
-<<<<<<< HEAD
 ^README\.Rmd$
 src/.clang-format
 LICENSE.md
 ^README\.Rmd$
-=======
->>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32()