fixed merge conflict in tests/index

2015-11-13 08:33:04 -07:00 · 2015-11-13 08:33:04 -07:00 · 8730b6659f
commit 8730b6659f
parent dc5b54cfbf bb05e114d7
116 changed files with 1793 additions and 1106 deletions
--- a/app/pods/protected/about/route.js
+++ b/app/pods/protected/about/route.js
@ -1,3 +1,5 @@
 import Ember from 'ember';

-export default Ember.Route.extend({});
+const { Route } = Ember;
+
+export default Route.extend({});