From 7adda3506d2c9e002b4d549f6e3c13b06b6423f5 Mon Sep 17 00:00:00 2001 From: Isao Yagi Date: Wed, 18 Jul 2012 14:12:47 -0700 Subject: [PATCH] fix merge conflict for Bill/Iain's patch --- source/lib/app/autoload/resource-store-adapter.common.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/lib/app/autoload/resource-store-adapter.common.js b/source/lib/app/autoload/resource-store-adapter.common.js index efbacee35..ee92b7cba 100644 --- a/source/lib/app/autoload/resource-store-adapter.common.js +++ b/source/lib/app/autoload/resource-store-adapter.common.js @@ -85,7 +85,7 @@ YUI.add('mojito-resource-store-adapter', function(Y, NAME) { // Here we get either the a spec or a type source.func(env, source.name, context, function(err, data) { if (err) { - callback(err); + callback(err, {}); return; } @@ -104,8 +104,8 @@ YUI.add('mojito-resource-store-adapter', function(Y, NAME) { if (!my.validate(base)) { callback({ message: 'Instance was not valid.', - stack: JSON.stringify(base, null, 4) - }); + stack: Y.JSON.stringify(base, null, 4) + }, {}); return; }