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

---
 skins/larry/templates/folderedit.html |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/skins/larry/templates/folderedit.html b/skins/larry/templates/folderedit.html
index cfc8bc3..18d2469 100644
--- a/skins/larry/templates/folderedit.html
+++ b/skins/larry/templates/folderedit.html
@@ -12,13 +12,11 @@
 <roundcube:object name="folderdetails" class="propform" />
 </div>
 
-<div id="formfooter">
 <div class="footerleft formbuttons">
 	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
 	<roundcube:if condition="!strlen(request:_mbox)" />
 	<input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
 	<roundcube:endif />
-</div>
 </div>
 
 <roundcube:include file="/includes/footer.html" />

--
Gitblit v1.9.1