fix conflict

2018-07-08 22:38:37 +01:00 · 2018-07-08 22:38:37 +01:00 · a9b13d701d
commit a9b13d701d
parent 0a3f3e24c3 7259b4a39f
1 changed files with 3 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -20,5 +20,8 @@ If no command is specified, it is assumed to be the add command.
 - use a real database instead of json files
 - multiple todo lists
 - default filters
+<<<<<<< HEAD
 - `Task` object generates new string on `__str__` method instead of relying on
+=======
+- Task object generates new string on __str__ method instead of relying on
  accurate updating from functions