resolve conflicts

NGEET · Oct 19, 2018 · c14d51b · c14d51b
1 parent 42ae7fa
commit c14d51b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/main/EDTypesMod.F90 b/main/EDTypesMod.F90
@@ -122,10 +122,7 @@ module EDTypesMod
 
   ! special mode to cause PFTs to create seed mass of all currently-existing PFTs
   logical, parameter :: homogenize_seed_pfts  = .false.
-<<<<<<< HEAD
 
-=======
->>>>>>> c8b5e00bad84d4496074ff7c165987ea581ffd34
 
   !************************************
   !** COHORT type structure          **