Projects >> platform_packages_apps_settings >>fa4ff7df3e360ab951bc774227b9ba3ef2b72b0b

Chunk
Conflicting content 
     * @param validate true means that the fragment's Header needs to be validated
     */
    private void switchToHeader(Header header, boolean validate) {
<<<<<<< HEAD
        if (mCurrentHeader == header) {
=======
        if (mCurHeader == header) {
>>>>>>> 3b6cbdc6a29ff4ee3e62d9f203a6ec261f967b1d
            // This is the header we are currently displaying.  Just make sure
            // to pop the stack up to its root state.
            getFragmentManager().popBackStack(BACK_STACK_PREFS,
Solution content 
     * @param validate true means that the fragment's Header needs to be validated
     */
    private void switchToHeader(Header header, boolean validate) {
        if (mCurrentHeader == header) {
            // This is the header we are currently displaying.  Just make sure
            // to pop the stack up to its root state.
            getFragmentManager().popBackStack(BACK_STACK_PREFS,
File
SettingsActivity.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
            header.title = getTitle();
            header.fragment = fragmentClass;
            header.fragmentArguments = getIntent().getExtras();
<<<<<<< HEAD
=======
            mCurrentHeader = header;
>>>>>>> 3b6cbdc6a29ff4ee3e62d9f203a6ec261f967b1d
            return header;
        }
Solution content 
            header.fragment = fragmentClass;
            header.title = getTitle();
            header.fragmentArguments = getIntent().getExtras();
            return header;
        }
File
SettingsActivity.java
Developer's decision
Version 1
Kind of conflict
Attribute
Variable