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

---
 .gitignore |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 511a09a..30b18a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,10 @@
 config/*
 plugins/*/config.inc.php
 
+# this is for the sample plugin (via composer)
+plugins/rcsample
+plugins/plugin_manager
+
 # composer-related
 composer.json
 composer.phar

--
Gitblit v1.9.1