mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
Oops. This is the right merge conflict fix.
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user