浏览代码

Cleanup old merge infor in ChangeLog file

Carsten Dominik 15 年之前
父节点
当前提交
fe96737e6d
共有 1 个文件被更改,包括 0 次插入1 次删除
  1. 0 1
      lisp/ChangeLog

+ 0 - 1
lisp/ChangeLog

@@ -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>