Fix errors from rebase.

QualitativeDataRepository · Jan 31, 2019 · 34dfb7c3bac6b0d20f432e437bb071831a335800 · 34dfb7c
1 parent 3f1059e
commit 34dfb7c3bac6b0d20f432e437bb071831a335800
Unified Split

Showing with 0 additions and 4 deletions.

+0 −3 NAMESPACE

+0 −1 R/archivr.R
diff --git a/NAMESPACE b/NAMESPACE
@@ -27,8 +27,5 @@ import(readtext)
 import(rvest)
 import(stringr)
 import(tools)
-  
-<<<<<<< HEAD
 import(xml2)
-  
-=======
-  
->>>>>>> 83f2bdc... Assign folder_ids to environment
 importFrom(jsonlite,fromJSON)
diff --git a/R/archivr.R b/R/archivr.R
@@ -204,7 +204,6 @@ archiv_wayback <- function (arc_url) {
 #'  availability, the archive url if it exists and a timestamp for the last
 #'  web crawl.
 view_archiv <- function (lst, method="wayback") {
-  
-  if (typeof(lst) == "")
  if (method == "perma_cc") {
    newlst <- lapply(lst, from_perma_cc)
    df <- data.frame(matrix(unlist(newlst), nrow=length(newlst), byrow=T))