Merge branch 'develop' of https://github.com/andela/nazgul-cfh into c…

…hat-with-players # Conflicts: # public/js/services/game.js # public/views/question.html
andela · Apr 23, 2018 · c56d527 · c56d527
1 parent ac05828
commit c56d527
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/game.js b/app/controllers/game.js
@@ -1,4 +1,4 @@
-/* eslint-disable */
+/* eslint-disable  import/no-unresolved, import/extensions */
 
 import mongoose from 'mongoose';
 

diff --git a/app/models/game.js b/app/models/game.js
@@ -1,4 +1,4 @@
-/* eslint-disable */
+/* eslint-disable import/extensions, import/no-unresolved */
 import mongoose from 'mongoose';
 
 const { Schema } = mongoose;