merge fix after rebase

src/com/owncloud/android/ui/activity/FileActivity.java

@@ -580,4 +580,3 @@ public class FileActivity extends DrawerActivity
     }
 
 }
-}