Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / skins / admin / bookmarklet / styles / addedit.css

diff --git a/skins/admin/bookmarklet/styles/addedit.css b/skins/admin/bookmarklet/styles/addedit.css
index f8749f1..29a7d99 100644 (file)
--- a/skins/admin/bookmarklet/styles/addedit.css
+++ b/skins/admin/bookmarklet/styles/addedit.css
@@ -22,7 +22,11 @@
 
 /* markup buttons */
 .jsbuttonbar {
+<<<<<<< HEAD:nucleus/styles/addedit.css
+       height: 30px;
+=======
        padding: 3px;
+>>>>>>> skinnable-master:skins/admin/bookmarklet/styles/addedit.css
        cursor: default;
 }
 
@@ -39,8 +43,11 @@
 .jsbuttonspacer {
        float: left;
        width: 10px;
+<<<<<<< HEAD:nucleus/styles/addedit.css
+=======
 }
 
 .jsbuttonend {
        clear: both;
+>>>>>>> skinnable-master:skins/admin/bookmarklet/styles/addedit.css
 }