Changeset 8706

Timestamp:

06/24/11 07:35:27 (14 years ago)

Author:

Mathieu Morlighem

Message:

oops

File:

• issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.cpp (modified) (1 diff)

issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.cpp

@@ -63 +63 @@
         double  T,rho,sl,tc,mc;
 
-<<<<<<< .mine
-        if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1");
-=======
-        if      ((sgn !=  1) && (sgn != -1))
-                _error_("Sign should be either +1 or -1.\n");
->>>>>>> .r8690
+        if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1.\n");
 
         delta = central_meridian;