resolve merge conflicts

2017-11-23 16:56:49 +01:00
commit ee6c2097f5
@@ -26,10 +26,6 @@
        height: 28px;
        padding: 2px 0;
    }
-    #cke_1_top .cp-toolbar {
-        padding: 0;
-        display: block;
-    }
    .cke_wysiwyg_frame {
        min-width: 60%;
    }