yade-dev team mailing list archive

[chareyre at BerliOS <chareyre@xxxxxxxxxxxxxxx>]

Author: chareyre
Date: 2008-11-17 18:11:31 +0100 (Mon, 17 Nov 2008)
New Revision: 1575

Modified:
   trunk/pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp
Log:

Still recovering from conflicted files... I hope this is the last one.



Modified: trunk/pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp	2008-11-17 15:48:37 UTC (rev 1574)
+++ trunk/pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp	2008-11-17 17:11:31 UTC (rev 1575)
@@ -51,7 +51,6 @@
 	previousSigmaIso=sigma_iso;
 	frictionAngleDegree = -1;
 	epsilonMax = 0.5;
-<<<<<<< .mine
 
 	isotropicCompaction=false;
 	spheresVolume=0;