Merge pull request #4694 from nextcloud/account-cleanup-conflicts-resolve-activity

Remove onAccountSet from ConflictsResolveActivity

src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java

@@ -82,8 +82,8 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
     }
 
     @Override
-    protected void onAccountSet(boolean stateWasRecovered) {
-        super.onAccountSet(stateWasRecovered);
+    protected void onStart() {
+        super.onStart();
         if (getAccount() != null) {
             OCFile file = getFile();
             if (getFile() == null) {