From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 30 Nov 2008 21:56:30 +0000 (+0100)
Subject: clean merge conflict
X-Git-Tag: LCARStrek-2.0a2~7
X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=c09bd2ddc32d2bd0de40b939b6641684c4f0b97b;hp=c710949da7cada91a80f0b6cece1a7fc0388c640

clean merge conflict
---

diff --git a/LCARStrek/navigator/navigator.css b/LCARStrek/navigator/navigator.css
index 64067e3a..95f79f54 100644
--- 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);