mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-10 16:05:49 +01:00
fixed conflicts
This commit is contained in:
@@ -12,7 +12,7 @@ var socket,
|
||||
socket = io.connect('http://' + config.socket.address + config.socket.port? ':' + config.socket.port : '');
|
||||
|
||||
socket.on('event:connect', function(data) {
|
||||
console.log('connected to socket.io: ', data);
|
||||
console.log('connected to nodebb socket: ', data);
|
||||
});
|
||||
|
||||
socket.on('event:alert', function(data) {
|
||||
|
||||
Reference in New Issue
Block a user