[cig-commits] [commit] devel: Fix conflict (d6cf045)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem3d

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/8a3f14d7d473f70feb7f073639045daa35c587bc...d759e09dd946c593868753fbb4253d77378fb276

>---------------------------------------------------------------

commit d6cf045747e6d9e95aff5d737c2907e7fa3bc4d2
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Tue Jul 1 18:31:33 2014 +0200

    Fix conflict


>---------------------------------------------------------------

d6cf045747e6d9e95aff5d737c2907e7fa3bc4d2
 src/specfem3D/initialize_simulation.f90 | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/specfem3D/initialize_simulation.f90 b/src/specfem3D/initialize_simulation.f90
index e391332..e4f044a 100644
--- a/src/specfem3D/initialize_simulation.f90
+++ b/src/specfem3D/initialize_simulation.f90
@@ -60,14 +60,6 @@
 
 !! DK DK added this for now (March 2013) because CPML is not yet implemented for fluid-solid coupling;
 !! DK DK we will soon add it (in a month or so)
-!! Temp com !! <<<<<<< HEAD
-  if(PML_CONDITIONS .and. ELASTIC_SIMULATION .and. ACOUSTIC_SIMULATION) &
-    stop 'PML_CONDITIONS is still under test for this case'
-!! Temp com !! =======
-  if(PML_CONDITIONS .and. (SAVE_FORWARD .or. SIMULATION_TYPE==3)) &
-    stop 'It is still under test for adjoint simulation'
-!! Temp com !! >>>>>>> e6a0ddf9cc4f82b41302ffa3f4a4bab32503f718
-
   if(PML_CONDITIONS .and. (SAVE_FORWARD .or. SIMULATION_TYPE==3)) &
     stop 'PML_CONDITIONS is still under test for adjoint simulation'