From f351ab9544d50dc39b806e3a31c05bc17f76b2a9 Mon Sep 17 00:00:00 2001
From: Rohit Kabadi <rkabadi06@gmail.com>
Date: Thu, 30 Jul 2015 00:37:11 -0700
Subject: [PATCH] Updated branch to avoid conflicts in requirements.txt

---
 requirements.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index f0f49e5a248..b4adce86d22 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -91,3 +91,6 @@ pywemo>=0.1
 
 # Wink (*.wink)
 https://github.com/balloob/python-wink/archive/master.zip#pywink>=0.1
+
+# PyEdimax
+https://github.com/rkabadi/pyedimax/archive/master.zip
\ No newline at end of file