From 583194a19a8360ac06c5ed1af6ec362b3228be84 Mon Sep 17 00:00:00 2001
From: jabarros <jabarros@solidgear.es>
Date: Thu, 23 Oct 2014 11:16:31 +0200
Subject: [PATCH] Add comment removed when fixing conflict in merge

---
 src/com/owncloud/android/ui/adapter/FileListListAdapter.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index b679030a..1bf28eae 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -242,6 +242,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 }
             } 
             else {
+                  // TODO Re-enable when server supports folder-size calculation
 //                if (FileStorageUtils.getDefaultSavePathFor(mAccount.name, file) != null){
 //                    fileSizeV.setVisibility(View.VISIBLE);
 //                    fileSizeV.setText(getFolderSizeHuman(FileStorageUtils.getDefaultSavePathFor(mAccount.name, file)));
-- 
2.11.0