Merge pull request #11771 from martndemus/remove-controller-controlle…

…r-for [CLEANUP beta] Remove deprecated Controller#controllerFor
emberjs · Jul 21, 2015 · e532dcd · e532dcd
2 parents 6b5e347 + 58dee2f
commit e532dcd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 31 deletions.
diff --git a/packages/ember-application/lib/ext/controller.js b/packages/ember-application/lib/ext/controller.js
diff --git a/packages/ember-application/lib/main.js b/packages/ember-application/lib/main.js
@@ -11,7 +11,6 @@ import {
   Resolver
 } from 'ember-application/system/resolver';
 import Application from 'ember-application/system/application';
-import 'ember-application/ext/controller'; // side effect of extending ControllerMixin
 
 Ember.Application = Application;
 Ember.Resolver = Resolver;