correcting rebase issue in histogram diagnostics

Author: cjvogl

components/eamxx/src/share/io/eamxx_io_utils.cpp

@@ -148,11 +148,8 @@ create_diagnostic (const std::string& diag_field_name,
   std::regex zonal_avg (R"()" + generic_field + R"(_zonal_avg_(\d+)_bins$)");
   std::regex conditional_sampling (R"()" + generic_field + R"(_where_)" + generic_field + R"(_(gt|ge|eq|ne|le|lt)_([+-]?\d+(?:\.\d+)?)$)");
   std::regex binary_ops (generic_field + "_" "(plus|minus|times|over)" + "_" + generic_field + "$");
-<<<<<<< HEAD
-  std::regex vert_derivative (generic_field + "_(p|z)vert_derivative$");
-=======
   std::regex histogram (R"()" + generic_field + R"(_histogram_(\d+(\.\d+)?(_\d+(\.\d+)?)+)$)");
->>>>>>> d7d46fa74e (added regex to eamxx_io_utils for histogram diag)
+  std::regex vert_derivative (generic_field + "_(p|z)vert_derivative$");
 
   std::string diag_name;
   std::smatch matches;