fix merge conflict for Bill/Iain's patch

YahooArchive · Jul 18, 2012 · 7adda35 · 7adda35
1 parent 069d485
commit 7adda35
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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;
                     }