From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 program/js/tiny_mce/themes/advanced/skins/highcontrast/content.css |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/program/js/tiny_mce/themes/advanced/skins/highcontrast/content.css b/program/js/tiny_mce/themes/advanced/skins/highcontrast/content.css
index fe09e21..cbce6c6 100644
--- a/program/js/tiny_mce/themes/advanced/skins/highcontrast/content.css
+++ b/program/js/tiny_mce/themes/advanced/skins/highcontrast/content.css
@@ -22,4 +22,3 @@
 img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
 font[face=mceinline] {font-family:inherit !important}
 *[contentEditable]:focus {outline:0}
-.mceHideBrInPre pre br {display: none}

--
Gitblit v1.9.1