Fixed merge conflict

2013-06-07 08:44:27 -07:00 · 2013-06-07 08:44:27 -07:00 · 89082ea94e
parent 0a32079922
commit 89082ea94e
1 changed files with 0 additions and 1 deletions
--- a/UI/Shared/Cells/FileSizeCell.js
+++ b/UI/Shared/Cells/FileSizeCell.js
@ -8,6 +8,5 @@ NzbDrone.Shared.Cells.FileSizeCell = Backgrid.Cell.extend({
        this.$el.html(NzbDrone.Shared.FormatHelpers.FileSizeHelper(size));
        this.delegateEvents();
        return this;
-        return this;
    }
 });