From: Bernt Hansen <bernt@norang.ca>
To: emacs-orgmode@gnu.org
Cc: Bernt Hansen <bernt@norang.ca>
Subject: [PATCH] Remove leftover merge separater line
Date: Thu, 26 Nov 2009 15:23:25 -0500 [thread overview]
Message-ID: <1259267005-24607-1-git-send-email-bernt@norang.ca> (raw)
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
reply other threads:[~2009-11-26 20:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1259267005-24607-1-git-send-email-bernt@norang.ca \
--to=bernt@norang.ca \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.