solve conflict

traets · Apr 23, 2019 · 3965192 · 3965192
1 parent 4abca70
commit 3965192
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -33,13 +33,8 @@ END_RCPP
 }
 
 static const R_CallMethodDef CallEntries[] = {
-<<<<<<< HEAD
-    {"_idefix_InfoDes_cpp", (DL_FUNC) &_idefix_InfoDes_cpp, 3},
-    {"_idefix_det_cpp", (DL_FUNC) &_idefix_det_cpp, 1},
-=======
     {"_idefix_det_cpp", (DL_FUNC) &_idefix_det_cpp, 1},
     {"_idefix_InfoDes_cpp", (DL_FUNC) &_idefix_InfoDes_cpp, 4},
->>>>>>> fe420387d86d4f6ff762f2809d2b1713bfc6b6eb
     {NULL, NULL, 0}
 };