Projects >> foursquared >>833074e32f5949b1c055e87aa0bd667874bd1dd1

Chunk
Conflicting content 
    public void removeLocationUpdates() {
        mBestLocationListener
                .unregister((LocationManager)getSystemService(Context.LOCATION_SERVICE));
<<<<<<< HEAD
    }

    public void switchCity(Location location) {
        mTaskHandler.sendMessage( //
                mTaskHandler.obtainMessage(TaskHandler.MESSAGE_SWITCH_CITY, location));
=======
>>>>>>> 430d1e0d95ecc6ef130501f1b6e314ab4a23b57a
    }

    public Location getLastKnownLocation() {
Solution content 
    public void removeLocationUpdates() {
        mBestLocationListener
                .unregister((LocationManager)getSystemService(Context.LOCATION_SERVICE));
    }

    public void switchCity(Location location) {
        mTaskHandler.sendMessage( //
                mTaskHandler.obtainMessage(TaskHandler.MESSAGE_SWITCH_CITY, location));
    }

    public Location getLastKnownLocation() {
File
Foursquared.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature