Fix merge conflict

NateMeyvis · May 8, 2022 · 72039e8 · 72039e8
2 parents 8bd7878 + 9d5c355
commit 72039e8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/task_list.txt b/task_list.txt
@@ -1,4 +1,4 @@
 Move shelves
-Move air conditioners
-Empty dishwasher
+Move air conditioner
 Take vitamins
+Empty dishwasher