Cleanup old merge infor in ChangeLog file

This commit is contained in:
Carsten Dominik 2009-11-27 00:37:16 +01:00
parent 88cf58802c
commit fe96737e6d
1 changed files with 0 additions and 1 deletions

View File

@ -40,7 +40,6 @@
* org-colview.el (org-agenda-colview-summarize): Sort out some
confusion between properties and titles, which resulted in
agenda summaries not working if a title was set for a column.
>>>>>>> james/bugfixes:lisp/ChangeLog
2009-11-24 Carsten Dominik <carsten.dominik@gmail.com>