Index: trunk/LMDZ.GENERIC/libf/phystd/tracer_h.F90
===================================================================
--- trunk/LMDZ.GENERIC/libf/phystd/tracer_h.F90	(revision 2804)
+++ trunk/LMDZ.GENERIC/libf/phystd/tracer_h.F90	(revision 2805)
@@ -7,10 +7,5 @@
        integer, save :: nesp  ! number of species in the chemistry
        integer, save :: ngt   ! number of generic tracers
-<<<<<<< HEAD
 !$OMP THREADPRIVATE(nqtot,nesp,ngt)
-=======
-       integer, save :: n_rgcs ! number of Radiative Generic Condensable Species
-!$OMP THREADPRIVATE(nqtot,nesp,ngt,n_rgcs)
->>>>>>> d67f7c1... This is the RGCS scheme
 
        logical :: moderntracdef=.false. ! Standard or modern traceur.def
@@ -46,10 +41,5 @@
 !$OMP THREADPRIVATE(is_recomb,is_recomb_qset,is_recomb_qotf)
        integer, save, allocatable :: is_condensable(:)      ! 1 if tracer is generic, else 0 (added LT)
-<<<<<<< HEAD
-!$OMP THREADPRIVATE(is_condensable)   !also added by LT
-
-=======
        integer,save,allocatable :: is_rgcs(:)               ! 1 if tracer is a radiative generic condensable specie, else 0 (added LT 2022)
->>>>>>> d67f7c1... This is the RGCS scheme
        ! Lists of constants for condensable tracers
        integer, save, allocatable :: constants_mass(:)                    ! molecular mass of the specie (g/mol)
@@ -64,8 +54,5 @@
 !$OMP THREADPRIVATE(constants_RLVTT_generic,constants_metallicity_coeff)
 
-<<<<<<< HEAD
-=======
 !$OMP THREADPRIVATE(is_condensable,is_rgcs)   !also added by LT
->>>>>>> d67f7c1... This is the RGCS scheme
 ! tracer indexes: these are initialized in initracer and should be 0 if the
 !                 corresponding tracer does not exist