Index: lams_central/web/login.jsp
===================================================================
diff -u -r8da244ec1556095f2d595bdc109aa05d4dd9275e -r8ee35195b81535d3bd003bb946c26c83fbda42a6
--- lams_central/web/login.jsp	(.../login.jsp)	(revision 8da244ec1556095f2d595bdc109aa05d4dd9275e)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision 8ee35195b81535d3bd003bb946c26c83fbda42a6)
@@ -95,19 +95,12 @@
 						}
 						
 						function isBrowserNotCompatable() {
-<<<<<<< login.jsp
-							if(op) return true;	// Opera
-							else if(saf) return true;		// Safari
-							else if(ie8 || ie7) return false;	// IE8 IE7
-							else if(ie5xwin || ie5 || ie4 || ie5mac || ie5x || ie6) return true;
-=======
 							if(ie8 || ie7) return false; // IE8 IE7
 							else if(saf4) return false; //Safari4
 							else if(chrome) return false; //Chrome
 							else if(ie5xwin || ie5 || ie4 || ie5mac || ie5x || ie6) return true;
 							else if(saf) return true; // Safari
 							else if(op) return true;	// Opera
->>>>>>> 1.40.6.3
 							else if(moz) 
 								if((moz_brow.indexOf("Firefox") != -1) && (moz_brow_nu >= 1.5)) return false;	// Firefox 1.5+
 							else return true;