fix bad merge

fix merge part duex

Author: toddjordan

addon/components/dynamic-form.js

@@ -31,7 +31,7 @@ const DynamicForm = Ember.Component.extend({
     get(this, 'formRenderer').initLayout(this);
   },
 
-  __render() {
+  _render() {
     Ember.Logger.debug('_render');
     let renderer = get(this, 'formRenderer');
     renderer.render(get(this, 'renderSchema'), this);