From e7a742dbf4f932d2925515e3edac2e3441296b35 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Fri, 12 Dec 2014 09:38:24 -0500
Subject: [PATCH] Fixed merge error

---
 python_apps/airtime_analyzer/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python_apps/airtime_analyzer/setup.py b/python_apps/airtime_analyzer/setup.py
index f576d0409..f9f47a31e 100644
--- a/python_apps/airtime_analyzer/setup.py
+++ b/python_apps/airtime_analyzer/setup.py
@@ -28,7 +28,7 @@ setup(name='airtime_analyzer',
           'coverage',
           'mock',
           'python-daemon',
-          'requests'
+          'requests',
           'apache-libcloud',
           'rgain',
           # These next 3 are required for requests to support SSL with SNI. Learned this the hard way...