fix exports

r-spatial · Mar 31, 2024 · 045773b · 045773b
1 parent ec26159
commit 045773b
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -1344,21 +1344,12 @@ BEGIN_RCPP
 END_RCPP
 }
 
-<<<<<<< HEAD
-RcppExport SEXP c_s2_geography_writer_new(SEXP, SEXP, SEXP, SEXP);
-RcppExport SEXP c_s2_handle_geography(SEXP, SEXP);
-RcppExport SEXP c_s2_handle_geography_tessellated(SEXP, SEXP);
-RcppExport SEXP c_s2_projection_mercator(SEXP);
-RcppExport SEXP c_s2_projection_orthographic(SEXP);
-RcppExport SEXP c_s2_projection_plate_carree(SEXP);
-=======
 RcppExport SEXP c_s2_geography_writer_new(void *, void *, void *, void *);
 RcppExport SEXP c_s2_handle_geography(void *, void *);
 RcppExport SEXP c_s2_handle_geography_tessellated(void *, void *);
 RcppExport SEXP c_s2_projection_mercator(void *);
 RcppExport SEXP c_s2_projection_orthographic(void *);
 RcppExport SEXP c_s2_projection_plate_carree(void *);
->>>>>>> ba9ccc9 (build!)
 RcppExport SEXP c_s2_trans_s2_lnglat_new(void);
 RcppExport SEXP c_s2_trans_s2_point_new(void);