chore: remove erroneous HEAD from a merge conflict

NOAA-OWP · Oct 22, 2024 · 7fa16b7 · 7fa16b7
1 parent 27cfa94
commit 7fa16b7
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/pkg/proc.attr.hydfab/flow/fs_attrs_grab.R b/pkg/proc.attr.hydfab/flow/fs_attrs_grab.R
@@ -22,7 +22,6 @@ library(yaml)
 library(ncdf4)
 library(proc.attr.hydfab)
 library(glue)
-<<<<<<< HEAD
 
 # TODO is AWS_NO_SIGN_REQUEST necessary??
 # Sys.setenv(AWS_NO_SIGN_REQUEST="YES")