modify DarkEnergyPPF

sfu-cosmo · Jun 13, 2024 · 34f4cde · 34f4cde
1 parent 3409ab3
commit 34f4cde
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/fortran/DarkEnergyPPF.f90 b/fortran/DarkEnergyPPF.f90
@@ -52,11 +52,8 @@ end subroutine TDarkEnergyPPF_SelfPointer
 
     subroutine TDarkEnergyPPF_Init(this, State)
     use classes
-<<<<<<< HEAD
 	use MGCAMB
-=======
     use config
->>>>>>> upstream/master
     class(TDarkEnergyPPF), intent(inout) :: this
     class(TCAMBdata), intent(in), target :: State