Fix previous jojo merge or not

app.js

@@ -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')));