resolve merge conflicts

westonslaughter · westonslaughter · commit 7b608ed96750 · 2022-10-26T14:35:32.000-04:00
diff --git a/src/acquisition_master.R b/src/acquisition_master.R
@@ -292,13 +292,6 @@ ms_globals <- c(ls(all.names = TRUE), 'ms_globals')
 
 dir.create('logs', showWarnings = FALSE)
 
-<<<<<<< HEAD
-dmnrow = 20
-## print(network_domain, n=50)
-=======
-# dmnrow = 12
-# print(network_domain, n=50)
->>>>>>> e2604ab9dbc8d0a005d9012d15cfa35daa6e4c0e
 for(dmnrow in 1:nrow(network_domain)){
 
     # drop_automated_entries('.') #use with caution!
diff --git a/src/global/global_helpers.R b/src/global/global_helpers.R
@@ -14843,9 +14843,6 @@ reformat_camels_for_ms <- function(){
         }
     }
 }
-<<<<<<< HEAD
-
-
 
 scrape_data_download_urls <- function() {
   raw_fp <- "./vault/raw_documentation_files/"
@@ -14869,5 +14866,3 @@ scrape_data_download_urls <- function() {
     }
   }
 }
-=======
->>>>>>> e2604ab9dbc8d0a005d9012d15cfa35daa6e4c0e

Original file line number	Diff line number	Diff line change
`@@ -14843,9 +14843,6 @@ reformat_camels_for_ms <- function(){`
`14843`	`14843`	`}`
`14844`	`14844`	`}`
`14845`	`14845`	`}`
`14846`		`-<<<<<<< HEAD`
`14847`		`-`
`14848`		`-`
`14849`	`14846`
`14850`	`14847`	`scrape_data_download_urls <- function() {`
`14851`	`14848`	`raw_fp <- "./vault/raw_documentation_files/"`
`@@ -14869,5 +14866,3 @@ scrape_data_download_urls <- function() {`
`14869`	`14866`	`}`
`14870`	`14867`	`}`
`14871`	`14868`	`}`
`14872`		`-=======`
`14873`		`->>>>>>> e2604ab9dbc8d0a005d9012d15cfa35daa6e4c0e`