From 85eeb4aef2e156dc0989f652eb75f83a86d79e76 Mon Sep 17 00:00:00 2001
From: Kamal Bennani <kamalbouchboy1@hotmail.fr>
Date: Sun, 18 Nov 2018 23:56:02 +0100
Subject: [PATCH] Fix wrong rebase

---
 packages/strapi-hook-mongoose/lib/relations.js       | 4 ++--
 packages/strapi-plugin-graphql/services/Resolvers.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/strapi-hook-mongoose/lib/relations.js b/packages/strapi-hook-mongoose/lib/relations.js
index 062a608760..682a7a5adc 100644
--- a/packages/strapi-hook-mongoose/lib/relations.js
+++ b/packages/strapi-hook-mongoose/lib/relations.js
@@ -113,8 +113,8 @@ module.exports = {
         } else {
           const model = association.plugin
             ? strapi.plugins[association.plugin].models[
-                association.collection || association.model
-              ]
+              association.collection || association.model
+            ]
             : strapi.models[association.collection || association.model];
 
           // Generate lookup for this relation
diff --git a/packages/strapi-plugin-graphql/services/Resolvers.js b/packages/strapi-plugin-graphql/services/Resolvers.js
index 0ad27599ac..dfbeb680e6 100644
--- a/packages/strapi-plugin-graphql/services/Resolvers.js
+++ b/packages/strapi-plugin-graphql/services/Resolvers.js
@@ -398,11 +398,11 @@ module.exports = {
               queryOpts.skip = convertedParams.start;
 
               switch (association.nature) {
-                case 'manyToMany': {
+                case "manyToMany":
                   const arrayOfIds = (obj[association.alias] || []).map(
                     related => {
                       return related[ref.primaryKey] || related;
-                    },
+                    }
                   );
 
                   // Where.