| Chunk |
|---|
| Conflicting content |
|---|
}
<<<<<<< HEAD
} catch (Exception e) {
=======
//FileDownload.Download(result, UserID, APIKey);
>>>>>>> 3dd5553afcbc5d5f480c8796cbfd8e2e36c725a0
}
ivleLogOutput.Log("Sync done"); |
| Solution content |
|---|
}
//FileDownload.Download(result, UserID, APIKey);
}
ivleLogOutput.Log("Sync done"); |
| File |
|---|
| SyncThread.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Catch clause |
| Comment |