Projects >> astrid >>75ad7c4e78247d89bae08764a4f575a350e10571

Chunk
Conflicting content
        }
    }

<<<<<<< HEAD
=======
    @SuppressWarnings("nls")
    private void showFilterListActivity() {
        Intent intent = (Intent) getActivity().getIntent().clone();
        intent.setComponent(new ComponentName(getActivity(), FilterListWrapperActivity.class));
        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
        startActivity(intent);
        AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_right_in, R.anim.slide_right_out);
    }

>>>>>>> 2b13026d9bcc1e9110ddcf70fc3706d48bd74c7d
    @Override
    public void onSortSelected(boolean always, int flags, int sort) {
        sortFlags = flags;
Solution content
        }
    }

    @Override
    public void onSortSelected(boolean always, int flags, int sort) {
        sortFlags = flags;
File
TaskListActivity.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration