thereadme/ipsum.ir
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix my mistake

Browse Source
This commit is contained in:
Ali Movahedi 2015-04-30 20:56:05 +04:30
parent c9e8fa7433
commit e89f8f4a90
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipsum.js
View File

@ -1,13 +1,9 @@
var express = require('express'), var express = require('express'),
<<<<<<< HEAD
app = express(), app = express(),
server = require('http').Server(app), server = require('http').Server(app),
io = require('socket.io')(server), io = require('socket.io')(server),
fs = require('fs'), fs = require('fs'),
counter = require('./counter.json'); counter = require('./counter.json');
=======
app = express();
>>>>>>> d16e6fb07eb8765657af0e649b91101ff835a332
app.use(express.static(__dirname + '/client', {maxAge: 60*60*24*7})); app.use(express.static(__dirname + '/client', {maxAge: 60*60*24*7}));