gistfile1.js

<<<<<<< HEAD
      // recurse through dependencies object
      // to count total number objects
      loading = _.reduce(deps, function(total, val) {
        var count =
          _.isFunction(val) ? 1 :
          _.isArray(val) ? val.length :
          _.isObject(val) ? _.keys(val).length : 0;
        return count + total;
      }, 0);

      // return if no dependencies
      if(_.isEmpty(deps) || loading === 0) { return resourcesLoaded(); }
=======
      // no dependencies
      if(_.isEmpty(deps)) { return resourcesLoaded(); }

      // recurse through dependencies object
      // to count total number objects
      loading = _.reduce(deps, function(total, val) {
        var count =
          _.isFunction(val) ? 1 :
          _.isArray(val) ? val.length :
          _.isObject(val) ? _.keys(val).length : 0;
        return count + total;
      }, 0);
>>>>>>> master