Modifed to use new editor chrome location

xpfe/browser/src/navigator.xul

@@ -469,8 +469,7 @@
       }
     }
     if (toolkitCore) {
-      toolkitCore.ShowWindow("resource:/res/samples/EditorAppShell.xul",
-                             window);
+      toolkitCore.ShowWindow("chrome://editor/content/EditorAppShell.xul",window);
     }
   }
 
@@ -886,7 +885,14 @@
 					   <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;"/>