From 89082ea94ede2d540ca86d55dc4280c3716a2a09 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Fri, 7 Jun 2013 08:44:27 -0700
Subject: [PATCH] Fixed merge conflict
---
UI/Shared/Cells/FileSizeCell.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/UI/Shared/Cells/FileSizeCell.js b/UI/Shared/Cells/FileSizeCell.js
index 72d24ad61..f1d8d4fab 100644
--- 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;
}
});