fix for bad merge on router

mharris717 · Mar 28, 2021 · deeba1d · deeba1d
1 parent ce66abb
commit deeba1d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.2",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.25.1",
+    "ember-source": "~3.26.1",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^2.18.1",
     "ember-try": "^1.4.0",

diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -16,4 +16,3 @@ Router.map(function() {
   this.route("multiple");
 });
 
-export default Router;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,3 @@ Router.map(function() {
		this.route("multiple");
		});

		export default Router;