Commit cce16fd2 authored by Corentin Mors's avatar Corentin Mors
Browse files

Fix previous jojo merge or not

parent 49735851
......@@ -33,11 +33,9 @@ var personnages = require('./models/users');
var resources = require('./models/resources');
var listes = require('./models/checklists');
var source = require('./models/sources');
<<<<<<< HEAD
var datacenter = require('./models/datacenters');
=======
var tache = require('./models/tasks');
>>>>>>> feature/views
// Load templating and statics
app.use(express.static(path.join(__dirname, 'public')));
......
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