From 2f85941d376b20b3a2a0785f68d6cf1a8a1d41e1 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 20 Jun 2010 16:03:00 -0400
Subject: [PATCH] Typo

- Removed residual conflict marker.
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 874eace21..d95aec23c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.