Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 10:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge conflicts that were checkedin.

Browse Source
This commit is contained in:
sfraser%netscape.com 1999-04-21 19:27:35 +00:00
parent 54b75cae7d
commit 8af29a63de
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xpfe/browser/src/navigator.xul
View File

@ -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();"/>