Commit 8253782a authored by 何硕's avatar 何硕

Merge branch 'heshuo' into 'master'

test

See merge request !9
parents de1dfbad a077e5af
......@@ -98,10 +98,10 @@ io.on('connection', function(socket){
});
// http.listen(3000, function(){
// console.log('http listening on *:3000');
// });
http.listen(3000, function(){
console.log('http listening on *:3000');
});
https.createServer(httpsOption, app).listen(3000, function(){
console.log('https listening on *:3000');
});
\ No newline at end of file
// https.createServer(httpsOption, app).listen(3000, function(){
// console.log('https listening on *:3000');
// });
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment