Cleanup old merge infor in ChangeLog file
This commit is contained in:
parent
88cf58802c
commit
fe96737e6d
|
@ -40,7 +40,6 @@
|
||||||
* org-colview.el (org-agenda-colview-summarize): Sort out some
|
* org-colview.el (org-agenda-colview-summarize): Sort out some
|
||||||
confusion between properties and titles, which resulted in
|
confusion between properties and titles, which resulted in
|
||||||
agenda summaries not working if a title was set for a column.
|
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>
|
2009-11-24 Carsten Dominik <carsten.dominik@gmail.com>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue