From 69cd9ccd8cc4eeebcc42f01c666b9a118121cd28 Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Mon, 16 Jun 2014 14:06:16 -0700
Subject: [PATCH] Oops. This is the right merge conflict fix.

---
 tools/deploy.js  | 1 -
 tools/run-app.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tools/deploy.js b/tools/deploy.js
index df9d3e4158..1277772325 100644
--- a/tools/deploy.js
+++ b/tools/deploy.js
@@ -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);
 
diff --git a/tools/run-app.js b/tools/run-app.js
index 5271b6489f..aa9db2cec7 100644
--- a/tools/run-app.js
+++ b/tools/run-app.js
@@ -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);