mirror of
https://github.com/jashkenas/backbone.git
synced 2026-04-30 03:00:06 -04:00
fix leftover merge conflict
This commit is contained in:
@@ -1163,7 +1163,7 @@
|
||||
if (this.className) attrs['class'] = _.result(this, 'className');
|
||||
this.setElement(document.createElement(_.result(this, 'tagName')), attrs);
|
||||
} else {
|
||||
this.setElement(_.result(this, 'el'), null, false);
|
||||
this.setElement(_.result(this, 'el'));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user