Fixed merge error

This commit is contained in:
drigato 2014-12-12 09:38:24 -05:00
parent 29d3d877ab
commit e7a742dbf4

View file

@ -28,7 +28,7 @@ setup(name='airtime_analyzer',
'coverage', 'coverage',
'mock', 'mock',
'python-daemon', 'python-daemon',
'requests' 'requests',
'apache-libcloud', 'apache-libcloud',
'rgain', 'rgain',
# These next 3 are required for requests to support SSL with SNI. Learned this the hard way... # These next 3 are required for requests to support SSL with SNI. Learned this the hard way...