Fixed merge conflict
This commit is contained in:
parent
0a32079922
commit
89082ea94e
|
@ -8,6 +8,5 @@ NzbDrone.Shared.Cells.FileSizeCell = Backgrid.Cell.extend({
|
||||||
this.$el.html(NzbDrone.Shared.FormatHelpers.FileSizeHelper(size));
|
this.$el.html(NzbDrone.Shared.FormatHelpers.FileSizeHelper(size));
|
||||||
this.delegateEvents();
|
this.delegateEvents();
|
||||||
return this;
|
return this;
|
||||||
return this;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue