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/markasjunk/package.xml |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/markasjunk/package.xml b/plugins/markasjunk/package.xml
index a5b4bf9..9559748 100644
--- a/plugins/markasjunk/package.xml
+++ b/plugins/markasjunk/package.xml
@@ -13,11 +13,10 @@
 		<email>roundcube@gmail.com</email>
 		<active>yes</active>
 	</lead>
-	<date>2010-03-29</date>
-	<time>13:20:00</time>
+	<date>2013-08-29</date>
 	<version>
-		<release>1.1</release>
-		<api>1.1</api>
+		<release>1.2</release>
+		<api>1.2</api>
 	</version>
 	<stability>
 		<release>stable</release>

--
Gitblit v1.9.1