Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chat: fix merge problem

Browse source
This commit is contained in:
Felix Niklas 2015-11-12 15:20:07 +01:00
parent 77aeb271f8
commit 377910ce20
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/assets/chat/chat.coffee
View file

@ -315,8 +315,8 @@ do($ = window.jQuery, window) ->
# show queue position # show queue position
show() show()
onQueue: (position) => onQueue: (data) =>
@log 'notice', 'onQueue', position @log 'notice', 'onQueue', data.position
@inQueue = true @inQueue = true
@setSessionId data.session_id @setSessionId data.session_id