From 8af29a63de2dc32402bc232103d49a59b590da26 Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com" <sfraser%netscape.com>
Date: Wed, 21 Apr 1999 19:27:35 +0000
Subject: [PATCH] Fix merge conflicts that were checkedin.

---
 xpfe/browser/src/navigator.xul | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/xpfe/browser/src/navigator.xul b/xpfe/browser/src/navigator.xul
index e12498f85728..e6c076e9dec9 100644
--- a/xpfe/browser/src/navigator.xul
+++ b/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();"/>