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/localization/en_US/csv2vcard.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/program/localization/en_US/csv2vcard.inc b/program/localization/en_US/csv2vcard.inc
index caf192a..eb884f5 100644
--- a/program/localization/en_US/csv2vcard.inc
+++ b/program/localization/en_US/csv2vcard.inc
@@ -2,9 +2,9 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/en_US/csv2vcard.inc                                          |
+ | localization/<lang>/csv2vcard.inc                                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
+ | Localization file of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |

--
Gitblit v1.9.1