From 061dd3f89a9d2147e98280118c3b87e5d6940f20 Mon Sep 17 00:00:00 2001
From: nymea <bernhard.trinnes@guh.io>
Date: Tue, 25 Jun 2019 22:56:41 +0200
Subject: [PATCH] fix merge error

---
 nymea-plugins.pro | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nymea-plugins.pro b/nymea-plugins.pro
index c3f6893..b3ded9b 100644
--- a/nymea-plugins.pro
+++ b/nymea-plugins.pro
@@ -44,7 +44,6 @@ PLUGIN_DIRS = \
     unitec              \
     wakeonlan           \
     wemo                \
-    ws2812              \
     ws2812fx            \