Update regional_atmaq removing typos from branch sync

natalie-perlin · Dec 7, 2023 · cf73fde · cf73fde
1 parent 4455578
commit cf73fde
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/tests/regional_atmaq b/tests/tests/regional_atmaq
@@ -100,10 +100,6 @@ export CCPP_SUITE=FV3_GFS_v15p2
 
 if [[ $MACHINE_ID = hera ]]; then
   TPN=30
-<<<<<<< HEAD
 elif [[ $MACHINE_ID = gaea ]]; then
-=======
-elif [[ $MACHINE_ID = cheyenne || $MACHINE_ID = gaea* ]]; then
->>>>>>> develop
   TPN=16
 fi