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/lib/Net/IDNA2/Exception.php |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/program/lib/Net/IDNA2/Exception.php b/program/lib/Net/IDNA2/Exception.php
index 9c77ad6..72cb1ae 100644
--- a/program/lib/Net/IDNA2/Exception.php
+++ b/program/lib/Net/IDNA2/Exception.php
@@ -1,3 +1,4 @@
-<?php
-class Net_IDNA2_Exception extends Exception {
-}
+<?php
+class Net_IDNA2_Exception extends Exception
+{
+}

--
Gitblit v1.9.1