From 9426e0294fda4d70fd0d3eb20472393381fb9375 Mon Sep 17 00:00:00 2001
From: eric james <eric.james@noaa.gov>
Date: Mon, 5 Feb 2024 17:14:24 +0000
Subject: [PATCH] Resolving conflicts

---
 parm/postxconfig-NT-fv3lam_rrfs.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/parm/postxconfig-NT-fv3lam_rrfs.txt b/parm/postxconfig-NT-fv3lam_rrfs.txt
index 65c205129..1d54f5fa1 100644
--- a/parm/postxconfig-NT-fv3lam_rrfs.txt
+++ b/parm/postxconfig-NT-fv3lam_rrfs.txt
@@ -2,11 +2,7 @@
 4
 3
 250
-<<<<<<< HEAD
 311
-=======
-308
->>>>>>> origin/develop
 PRSLEV
 32769
 ncep_nco