Index: /issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.cpp
===================================================================
--- /issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.cpp	(revision 8705)
+++ /issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.cpp	(revision 8706)
@@ -63,10 +63,5 @@
 	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;