Projects >> Freebloks-Android >>0513aa6d846ec934f7ca2e37c5afdb3eecdcee3b

Chunk
Conflicting content 
	@Override
	public void onSignInSucceeded() {
<<<<<<< HEAD
		getGamesClient().unlockAchievement(getString(R.string.achievement_vip));
=======

>>>>>>> f3c8a48e7637169e5123406d25b43ef3e1071672
	}
}
Solution content 
	@Override
	public void onSignInSucceeded() {
		Games.Achievements.unlock(getApiClient(), getString(R.string.achievement_vip));
	}
}
File
FreebloksActivity.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceFragment;
<<<<<<< HEAD
import de.saschahlusiak.freebloksvip.R;
=======
import android.view.ViewConfiguration;
import de.saschahlusiak.freebloks.R;
>>>>>>> f3c8a48e7637169e5123406d25b43ef3e1071672

public class InterfaceFragment extends PreferenceFragment {
    @Override
Solution content 
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceFragment;
import de.saschahlusiak.freebloksvip.R;
import android.view.ViewConfiguration;

public class InterfaceFragment extends PreferenceFragment {
    @Override
File
InterfaceFragment.java
Developer's decision
Combination
Kind of conflict
Import