[cig-commits] [commit] devel: Conflicts temporary commented (5510605)

[cig_noreply at geodynamics.org]

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

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

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

commit 5510605f60a084909ec47394de0817bc48b1aa9c
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Tue Jul 1 10:57:44 2014 +0200

    Conflicts temporary commented


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

5510605f60a084909ec47394de0817bc48b1aa9c
 src/specfem3D/initialize_simulation.f90 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/specfem3D/initialize_simulation.f90 b/src/specfem3D/initialize_simulation.f90
index 11cfd24..e391332 100644
--- a/src/specfem3D/initialize_simulation.f90
+++ b/src/specfem3D/initialize_simulation.f90
@@ -60,13 +60,13 @@
 
 !! 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)
-<<<<<<< HEAD
+!! 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'
->>>>>>> e6a0ddf9cc4f82b41302ffa3f4a4bab32503f718
+!! Temp com !! >>>>>>> e6a0ddf9cc4f82b41302ffa3f4a4bab32503f718
 
   if(PML_CONDITIONS .and. (SAVE_FORWARD .or. SIMULATION_TYPE==3)) &
     stop 'PML_CONDITIONS is still under test for adjoint simulation'