Updating renv.lock changes.

Merge branch 'main' of https://github.com/carpentries-incubator/rna-seq-data-for-ml # Conflicts: # renv/activate.R
carpentries-incubator · Oct 16, 2023 · b7f7838 · b7f7838
2 parents 29a3662 + bfb75e1
commit b7f7838
Show file tree

Hide file tree

Showing 2 changed files with 286 additions and 35 deletions.
diff --git a/renv/activate.R b/renv/activate.R
@@ -2,7 +2,11 @@
 local({
 
   # the requested version of renv
+<<<<<<< HEAD
   version <- "0.17.3"
+=======
+  version <- "1.0.3"
+>>>>>>> bfb75e150f9c44c3c6b185486f768e48f1da4e8e
   attr(version, "sha") <- NULL
 
   # the project directory