Auto merge of #2773 - Turbo87:inline-resolver, r=locks

Inline `app/resolver.js` file

... to match the current ember-cli blueprint :)

r? `@locks`

Author: bors

app/app.js

@@ -1,9 +1,9 @@
 import Application from '@ember/application';
 
 import loadInitializers from 'ember-load-initializers';
+import Resolver from 'ember-resolver';
 
 import config from './config/environment';
-import Resolver from './resolver';
 
 const App = Application.extend({
   modulePrefix: config.modulePrefix,