From ffa4270f7e416630fea65fcfddf0aa53bd42aabc Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com"
 <sspitzer%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 19 Jun 1999 22:29:03 +0000
Subject: [PATCH] fix my stupidity.

git-svn-id: svn://10.0.0.236/trunk@35941 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/browser/src/navigator.xul | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mozilla/xpfe/browser/src/navigator.xul b/mozilla/xpfe/browser/src/navigator.xul
index 5d09c3e0d3a..bbf29a1f525 100644
--- a/mozilla/xpfe/browser/src/navigator.xul
+++ b/mozilla/xpfe/browser/src/navigator.xul
@@ -294,11 +294,7 @@
   <broadcaster id="Browser:Status"/>
   <broadcaster id="Browser:Security" secure="false"/>
   <broadcaster id="Browser:Throbber" busy="false"/>
-<<<<<<< navigator.xul
   <broadcaster id="args" value=""/>
-=======
-  <broadcaster id="args" value="http://www.mozillazine.org"/>
->>>>>>> 1.136
 
   <!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
   <broadcaster id="dialog.start" ready="false"/>