missing merge in clubb_intr

PeterHjortLauritzen · Jul 24, 2024 · a84f3c9 · a84f3c9
1 parent d32c6ba
commit a84f3c9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/physics/cam/clubb_intr.F90 b/src/physics/cam/clubb_intr.F90
@@ -401,11 +401,8 @@ module clubb_intr
     ice_supersat_idx, & ! ice cloud fraction for SILHS
     rcm_idx, &          ! Cloud water mixing ratio for SILHS
     ztodt_idx,&         ! physics timestep for SILHS
-<<<<<<< HEAD
     clubbtop_idx,     & ! level index for CLUBB top
     rcmtend_clubb_idx
-=======
-    clubbtop_idx        ! level index for CLUBB top
 
   !   For Gravity Wave code
   integer :: &
@@ -420,7 +417,6 @@ module clubb_intr
        wpthlp_clubb_gw_idx, &
        wpthlp_clubb_gw_mc_idx
 
->>>>>>> ESCOMP/cam_development
   ! Indices for microphysical covariance tendencies
   integer :: &
     rtp2_mc_zt_idx,   &