fix incorrect merge

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

View File

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