| Chunk |
|---|
| Conflicting content |
|---|
mLoginButton.init(this, mFacebook, new String[] { "read_friendlists",
"user_photos", "read_stream" });
mLoginButton.setVisibility(View.INVISIBLE);
<<<<<<< HEAD
=======
>>>>>>> 42e65f144537db3df7fa7c426ccfe5372a3cbf9d
// set 3 buttons's click
facebookBtn.setOnClickListener(new Button.OnClickListener() {
@Override |
| Solution content |
|---|
mLoginButton.setVisibility(View.INVISIBLE);
// set 3 buttons's click
facebookBtn.setOnClickListener(new Button.OnClickListener(){
@Override |
| File |
|---|
| LoginActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |