| Chunk |
|---|
| Conflicting content |
|---|
import com.google.android.googlelogin.GoogleLoginServiceConstants;
import java.io.IOException;
<<<<<<< HEAD
=======
import java.util.TimeZone;
>>>>>>> b829e3714cd9e01bfe44d24daa2b2d081857fe7d
public class LaunchActivity extends Activity {
static final String KEY_DETAIL_VIEW = "DETAIL_VIEW"; |
| Solution content |
|---|
import com.google.android.googlelogin.GoogleLoginServiceConstants;
import java.io.IOException;
public class LaunchActivity extends Activity {
static final String KEY_DETAIL_VIEW = "DETAIL_VIEW"; |
| File |
|---|
| LaunchActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |