complete merge

CIROH-UA · Feb 28, 2025 · e92fd68 · e92fd68
1 parent 45b298f
commit e92fd68
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/scripts/datastream b/scripts/datastream
@@ -466,16 +466,11 @@ if [ ! -z $NGEN_FORCINGS ]; then
     log_time "GET_FORCINGS_START" $DATASTREAM_PROFILING
     echo "Using $NGEN_FORCINGS"
     FORCINGS_BASE=$(basename $NGEN_FORCINGS)    
-<<<<<<< HEAD:scripts/stream.sh
-    get_file "$NGEN_FORCINGS" "$NGENRUN_FORCINGS"
-    log_time "GET_FORCINGS_END" $DATASTREAM_PROFILING
-=======
     if [ ! -e $DATASTREAM_RESOURCES_NGENFORCINGS ]; then
         mkdir -p $DATASTREAM_RESOURCES_NGENFORCINGS
         get_file "$NGEN_FORCINGS" "$DATASTREAM_RESOURCES_NGENFORCINGS"
     fi    
     log_time "GET_FORCINGS_END" $DATASTREAM_PROFILING $S3_OUT
->>>>>>> 8d5569d875c86f124f639cb8acf77a347f77ee9e:scripts/datastream
 else
     log_time "FORCINGPROCESSOR_START" $DATASTREAM_PROFILING $S3_OUT
     echo "Creating nwm filenames file"