From 5750758cf11bb411f45fcf925147acf58918be02 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 24 Jan 2017 17:27:05 -0300
Subject: [PATCH] Error with asset resolver

---
 graph/resolvers/asset.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index 7bb08182f..dcf6e1a75 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -5,13 +5,11 @@ const Asset = {
   settings({settings = null}, _, {loaders}) {
     return loaders.Settings.load()
       .then((globalSettings) => {
-
         if (settings) {
-          settings = Object.assign({}, settings, globalSettings.toObject());
+          settings = Object.assign({}, globalSettings.toObject(), settings);
         } else {
           settings = globalSettings.toObject();
         }
-
         return settings;
       });
   }