Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix incorrect merge

Browse source
This commit is contained in:
Martin Konecny 2013-04-26 13:58:44 -04:00
parent 705329ee5d
commit 49d1755b52
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python_apps/pypo/pypopush.py
View file

@ -57,8 +57,7 @@ class PypoPush(Thread):
self.queue_id = 0 self.queue_id = 0
self.future_scheduled_queue = Queue() self.future_scheduled_queue = Queue()
self.pypo_liquidsoap = PypoLiquidsoap(self.logger, telnet_lock,\ self.pypo_liquidsoap = pypo_liquidsoap
config['ls_host'], config['ls_port'])
self.plq = PypoLiqQueue(self.future_scheduled_queue, \ self.plq = PypoLiqQueue(self.future_scheduled_queue, \
self.pypo_liquidsoap, \ self.pypo_liquidsoap, \