* [PATCH] Remove leftover merge separater line
@ 2009-11-26 20:23 Bernt Hansen
0 siblings, 0 replies; only message in thread
From: Bernt Hansen @ 2009-11-26 20:23 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Bernt Hansen
This was leftover from a previous merge and should be deleted
---
This patch is available at git://git.norang.ca/org-mode.git for-carsten
lisp/ChangeLog | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1265f2b..4acb99c 100755
--- a/lisp/ChangeLog
+++ b/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>
--
1.6.6.rc0.54.gb073b
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-26 20:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-26 20:23 [PATCH] Remove leftover merge separater line Bernt Hansen
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).