clean merge conflict

diff --git a/LCARStrek/navigator/navigator.css b/LCARStrek/navigator/navigator.css
index 64067e3a0dc26c1667f235eaecd934768e425ddb..95f79f54c4059470e00032248ae8d552a5f8d098 100644 (file)
--- a/LCARStrek/navigator/navigator.css
+++ b/LCARStrek/navigator/navigator.css
@@ -399,6 +399,10 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   -moz-image-region: rect(48px 32px 64px 16px);
 }
 
+#urlbar-icons {
+  -moz-margin-end: 2px;
+}
+
 toolbar[iconsize="small"] > #back-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(32px 16px 48px 0);