try resolving conflict fetchters.R again

Author: mihem

R/fetchers.R

@@ -10,7 +10,7 @@ fetchgit <- function(git_pkg, ...) {
   package_name <- git_pkg$package_name
   repo_url <- git_pkg$repo_url
   commit <- git_pkg$commit
-  output <- get_sri_hash_deps(repo_url, commit, ...)
+  output <- nix_hash(repo_url, commit)
   sri_hash <- output$sri_hash
   # If package has no remote dependencie
 
@@ -369,7 +369,11 @@ fetchlocals <- function(local_r_pkgs) {
   }
 }
 
+<<<<<<< remove_duplicate_third
 
+=======
+
+>>>>>>> main
 #' fetchgits Downloads and installs packages hosted on Git. Wraps `fetchgit()`
 #' to handle multiple packages
 #' @param git_pkgs A list of three elements: "package_name", the name of the