cran release and conflicted copies

luisDVA · Feb 10, 2020 · 507c5e9 · 507c5e9
1 parent d807723
commit 507c5e9
Show file tree

Hide file tree

Showing 19 changed files with 0 additions and 699 deletions.
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
diff --git a/R/annotate_mf (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R b/R/annotate_mf (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R
diff --git a/R/dataset_documentation (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R b/R/dataset_documentation (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R
diff --git a/R/unbreak_fn (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R b/R/unbreak_fn (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R
diff --git a/R/unbreak_rows (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R b/R/unbreak_rows (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R
diff --git a/R/untangle_fn (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R b/R/untangle_fn (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R
diff --git a/R/unwrap_fn (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R b/R/unwrap_fn (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).R
diff --git a/data/primates2017 (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).rda b/data/primates2017 (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).rda
diff --git a/inst/extdata/dog_test (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).xlsx b/inst/extdata/dog_test (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).xlsx
diff --git a/man/annotate_mf (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).Rd b/man/annotate_mf (DESKTOP-RHM5BKF's conflicted copy 2020-02-04).Rd