Projects >> bo-android >>3db6a9d7fb5567c69fd848bbba182dfb79c3a7a1

Chunk
Conflicting content 
        if (appService != null) {
            appService.removeDataListener(this);
<<<<<<< HEAD
            appService.removeLocationListener(ownLocationOverlay);
        }

=======

            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
            if (preferences.getBoolean(PreferenceKey.SHOW_LOCATION.toString(), false)) {
                appService.clearLocationListener();
            }
        }
>>>>>>> ce30b601e8c48b15d143913b06a3c17749b365d2
    }

    @Override
Solution content 
        if (appService != null) {
            appService.removeDataListener(this);
            appService.removeLocationListener(ownLocationOverlay);
        }

    }

    @Override
File
Main.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable