- Removed residual conflict marker.
This commit is contained in:
Paul Beckingham 2010-06-20 16:03:00 -04:00
parent f3f4ae15eb
commit 2f85941d37

View file

@ -23,7 +23,6 @@
+ Improvements to the man pages (thanks to T. Charles Yun).
+ Added feature #408, making it possible to delete annotations with the new
denotate command and the provided description (thanks to Dirk Deimeke).
>>>>>>> denotate
+ Fixed bug #406 so that task now includes command aliases in the _commands
helper command used by shell completion scripts.
+ Fixed bug #211 - it was unclear which commands modify a task description.