Oops. This is the right merge conflict fix.

This commit is contained in:
Avital Oliver
2014-06-16 14:06:16 -07:00
parent 6ea5ab0ed1
commit 69cd9ccd8c
2 changed files with 0 additions and 2 deletions

View File

@@ -397,7 +397,6 @@ var bundleAndDeploy = function (options) {
if (! messages.hasMessages()) {
var bundler = require('./bundler.js');
var loader = project.generatePackageLoader(options.appDir);
if (options.recordPackageUsage)
stats.recordPackages(options.appDir);

View File

@@ -415,7 +415,6 @@ _.extend(AppRunner.prototype, {
packageCache.packageCache.refresh(true); // pick up changes to packages
var bundlePath = path.join(self.appDir, '.meteor', 'local', 'build');
var loader = project.generatePackageLoader(self.appDir);
if (self.recordPackageUsage)
stats.recordPackages(self.appDir);