Skip to content

Commit 8526e51

Browse files
romainfrancoisromainfrancois
committed
follow up from @wesm comments on #2489 
1 parent f03a277 commit 8526e51

File tree

5 files changed

+9
-218
lines changed

5 files changed

+9
-218
lines changed

‎r/DESCRIPTION‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ Package: arrow
22
Title: R Integration to 'Apache' 'Arrow'
33
Version: 0.0.0.9000
44
Authors@R: c(
5+
<<<<<<< HEAD
56
person("Romain", "François", email = "[email protected]", role = c("aut", "cre")),
7+
=======
8+
person("Romain", "François", email = "[email protected]", role = c("aut", "cre")),
9+
>>>>>>> follow up from @wesm comments on #2489
610
person("Apache Arrow", email = "[email protected]", role = c("aut", "cph"))
711
)
812
Description: R Integration to 'Apache' 'Arrow'.

‎r/LICENSE.md‎

Lines changed: 0 additions & 194 deletions
This file was deleted.

‎r/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33

44
# arrow
55

6+
<<<<<<< HEAD
67
<<<<<<< HEAD
78
R integration with Apache Arrow.
89
=======
910
Low level bindings to the C++ Apache Arrow library
1011
>>>>>>> + installation instructions
12+
=======
13+
R integration with Apache Arrow.
14+
>>>>>>> follow up from @wesm comments on #2489
1115
1216
## Installation
1317

‎r/src/hello.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include <Rcpp.h>
19-
#include "rrrow_types.h"
18+
#include "r_arrow_types.h"
2019

2120
using namespace Rcpp ;
2221
using namespace arrow ;

‎r/src/rrrow_types.h‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)