| Chunk |
|---|
| Conflicting content |
|---|
{
if( intent.getAction().equals(TIMER_TICK) )
{
<<<<<<< HEAD
Log.d(TAG, "TIMER_TICK");
if(currentlyRunning) {
Log.w(TAG, "WARNING: TIMER_TICKET while running syncIt");
} else {
currentlyRunning = true;
syncIt();
currentlyRunning = false;
}
=======
// Log.d(TAG, "TIMER_TICK");
// syncIt();
>>>>>>> b305b8b76aa83b603080ed934a189b580d1b8f85
TelephonyManager tm = (TelephonyManager) getSystemService(Activity.TELEPHONY_SERVICE);
GsmCellLocation location = (GsmCellLocation) tm.getCellLocation(); |
| Solution content |
|---|
} else {
{
if( intent.getAction().equals(TIMER_TICK) )
{
<<<<<<< HEAD
Log.d(TAG, "TIMER_TICK");
if(currentlyRunning) {
Log.w(TAG, "WARNING: TIMER_TICKET while running syncIt");
currentlyRunning = true;
syncIt();
currentlyRunning = false;
}
=======
// Log.d(TAG, "TIMER_TICK");
// syncIt();
>>>>>>> b305b8b76aa83b603080ed934a189b580d1b8f85
TelephonyManager tm = (TelephonyManager) getSystemService(Activity.TELEPHONY_SERVICE);
GsmCellLocation location = (GsmCellLocation) tm.getCellLocation(); |
| File |
|---|
| SyncService.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |