Fix merge conflict in tests

13 years ago · 556ddfa204
parent 7dcd93e608
commit 556ddfa204
1 changed files with 0 additions and 4 deletions
--- a/tests/src/com/todoroo/astrid/repeats/RepeatTestsGtasksSyncRemote.java
+++ b/tests/src/com/todoroo/astrid/repeats/RepeatTestsGtasksSyncRemote.java
@ -21,11 +21,7 @@ public class RepeatTestsGtasksSyncRemote extends RepeatTestsGtasksSync {
            completionDate = dueDate - DateUtilities.ONE_DAY;
        else
            completionDate = dueDate + DateUtilities.ONE_DAY;
-<<<<<<< HEAD
        remoteModel.completed = GtasksApiUtilities.unixTimeToGtasksCompletionTime(completionDate);
-=======
-        remoteModel.completed = GtasksApiUtilities.unixTimeToGtasksDate(completionDate);
->>>>>>> sbosley/110818_sb_repeat_tests
        remoteModel.status = "completed";
        try {
            gtasksService.updateGtask(GtasksApiUtilities.extractListIdFromSelfLink(remoteModel), remoteModel);