Fix merge conflicts that were checkedin.

xpfe/browser/src/navigator.xul

@@ -884,16 +884,9 @@
 		<titledbutton id="statusText" align="right" flex="1%" value="Document: Done" style="font-family:sans-serif;font-size:2.5mm">
 					   <observes element="Browser:Status" attribute="value" onchange="onStatus()"/>			
 		</titledbutton>
-
-<<<<<<< navigator.xul
+		
 		<spring flex="100%"/>
 
-Build ID: 1999040611
-		</titledbutton>
-=======
-		<spring flex="100%"/>		
->>>>>>> 1.65
-
 		<titledbutton align="right" value="Build ID: 1999040601" style="font-family:sans-serif;font-size:2.5mm;"/>
 				
 		<titledbutton id="security-button" class="insecure" value="Secure Conn" align="right" onclick="securityOff();"/>