Merge pull request emberjs#10681 from ef4/fix-unrecog

stefanpenner · stefanpenner · commit 9fbd5e0f7423 · 2015-03-19T23:24:26.000-07:00
Fix UnrecognizedURLError inheritance via router.js update
diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
   "devDependencies": {
     "backburner": "https://github.com/ebryn/backburner.js.git#f4bd6a2df221240ed36d140f0c53c036a7ecacad",
     "rsvp": "https://github.com/tildeio/rsvp.js.git#3.0.14",
-    "router.js": "https://github.com/tildeio/router.js.git#2a21f87512b259bdbb13e3b9faa1e06a898e5c1c",
+    "router.js": "https://github.com/tildeio/router.js.git#5081e7a5e3b0985608224f2f86e1a5c5c15e2662",
     "dag-map": "https://github.com/krisselden/dag-map.git#e307363256fe918f426e5a646cb5f5062d3245be",
     "ember-dev": "https://github.com/emberjs/ember-dev.git#1a1ef3e1806be21dd554d285521abc0b13cdfe20"
   }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"devDependencies": {`
`9`	`9`	`"backburner": "https://github.com/ebryn/backburner.js.git#f4bd6a2df221240ed36d140f0c53c036a7ecacad",`
`10`	`10`	`"rsvp": "https://github.com/tildeio/rsvp.js.git#3.0.14",`
`11`		`- "router.js": "https://github.com/tildeio/router.js.git#2a21f87512b259bdbb13e3b9faa1e06a898e5c1c",`
	`11`	`+ "router.js": "https://github.com/tildeio/router.js.git#5081e7a5e3b0985608224f2f86e1a5c5c15e2662",`
`12`	`12`	`"dag-map": "https://github.com/krisselden/dag-map.git#e307363256fe918f426e5a646cb5f5062d3245be",`
`13`	`13`	`"ember-dev": "https://github.com/emberjs/ember-dev.git#1a1ef3e1806be21dd554d285521abc0b13cdfe20"`
`14`	`14`	`}`