fixed conflicts

This commit is contained in:
psychobunny
2013-04-24 21:19:04 +00:00
5 changed files with 39 additions and 7 deletions

View File

@@ -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) {