fix rebase

lib/models/command.js

@@ -13,7 +13,6 @@ var _                   = require('ember-cli-lodash-subset');
 var EOL                 = require('os').EOL;
 var CoreObject          = require('core-object');
 var logger              = require('heimdalljs-logger')('ember-cli:command');
-var Watcher             = require('../models/watcher');
 var WatchDetector       = require('../models/watch-detector');
 var SilentError         = require('silent-error');
 var exec                = Promise.denodeify(require('child_process').exec)

package.json

@@ -85,18 +85,10 @@
     "inquirer": "^1.0.2",
     "is-git-url": "^0.2.0",
     "isbinaryfile": "^3.0.0",
-<<<<<<< 0d25eb6e395a679338492d86e59ce62dd920dd2f
     "leek": "0.0.23",
     "lodash.template": "^4.2.5",
     "markdown-it": "8.0.0",
     "markdown-it-terminal": "0.0.4",
-=======
-    "leek": "0.0.22",
-    "lodash": "^4.12.0",
-    "lodash.template": "^4.2.5",
-    "markdown-it": "7.0.0",
-    "markdown-it-terminal": "0.0.3",
->>>>>>> extract/test/fix/improve Watcher detection code
     "minimatch": "^3.0.0",
     "morgan": "^1.5.2",
     "node-modules-path": "^1.0.0",
@@ -107,11 +99,7 @@
     "ora": "^0.2.0",
     "portfinder": "^1.0.7",
     "promise-map-series": "^0.2.1",
-<<<<<<< 0d25eb6e395a679338492d86e59ce62dd920dd2f
     "quick-temp": "0.1.6",
-=======
-    "quick-temp": "^0.1.5",
->>>>>>> extract/test/fix/improve Watcher detection code
     "resolve": "^1.1.6",
     "rsvp": "^3.0.17",
     "sane": "^1.1.1",