[FEATURE ember-routing-inherits-parent-model] Enable by default.

rwjblue · rwjblue · commit b351b4a7c41d · 2014-02-07T17:19:15.000-05:00
diff --git a/features.json b/features.json
@@ -21,7 +21,7 @@
     "ember-routing-auto-location": true,
     "ember-routing-bound-action-name": true,
     "ember-runtime-test-friendly-promises": null,
-    "ember-routing-inherits-parent-model": null
+    "ember-routing-inherits-parent-model": true
   },
   "debugStatements": ["Ember.warn", "Ember.assert", "Ember.deprecate", "Ember.debug", "Ember.Logger.info"]
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"ember-routing-auto-location": true,`
`22`	`22`	`"ember-routing-bound-action-name": true,`
`23`	`23`	`"ember-runtime-test-friendly-promises": null,`
`24`		`- "ember-routing-inherits-parent-model": null`
	`24`	`+ "ember-routing-inherits-parent-model": true`
`25`	`25`	`},`
`26`	`26`	`"debugStatements": ["Ember.warn", "Ember.assert", "Ember.deprecate", "Ember.debug", "Ember.Logger.info"]`
`27`	`27`	`}`