From 0051f3a09c374b9d3ad2c5ef9f137433c5188a3f Mon Sep 17 00:00:00 2001
From: Ann Almgren <asalmgren@lbl.gov>
Date: Mon, 8 Jan 2024 16:41:18 -0800
Subject: [PATCH] fix oops from previous commit

---
 Source/IO/ReadFromInitNetcdf.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Source/IO/ReadFromInitNetcdf.cpp b/Source/IO/ReadFromInitNetcdf.cpp
index a5243fff..d9459ca8 100644
--- a/Source/IO/ReadFromInitNetcdf.cpp
+++ b/Source/IO/ReadFromInitNetcdf.cpp
@@ -52,9 +52,6 @@ read_bathymetry_from_netcdf (int /*lev*/,
     // Read the netcdf file and fill these FABs
     BuildFABsFromNetCDFFile<FArrayBox,Real>(domain, fname, NC_names, NC_dim_types, NC_fabs);
 }
-<<<<<<< HEAD
-#endif // REMORA_USE_NETCDF
-=======
 
 void
 read_coriolis_from_netcdf (int lev,
@@ -74,4 +71,3 @@ read_coriolis_from_netcdf (int lev,
     BuildFABsFromNetCDFFile<FArrayBox,Real>(domain, fname, NC_names, NC_dim_types, NC_fabs);
 }
 #endif // ROMSX_USE_NETCDF
->>>>>>> b553961fff1475da8f0d7bfed08e83a7d53cf393