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

---
 plugins/help/skins/classic/templates/help.html |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/plugins/help/skins/classic/templates/help.html b/plugins/help/skins/classic/templates/help.html
index 98beb66..2e430ec 100644
--- a/plugins/help/skins/classic/templates/help.html
+++ b/plugins/help/skins/classic/templates/help.html
@@ -4,7 +4,6 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/this/help.css" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
 <script type="text/javascript">
 function help_init_settings_tabs()
 {
@@ -13,7 +12,7 @@
 	    tab = '#helptab' + (action ? action : 'default');
     }
     $(tab).addClass('tablink-selected');
-}	       
+}
 </script>
 </head>
 <body>

--
Gitblit v1.9.1