From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: [PATCH] Remove leftover merge separater line Date: Thu, 26 Nov 2009 15:23:25 -0500 Message-ID: <1259267005-24607-1-git-send-email-bernt@norang.ca> Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDksO-0002ZW-0M for emacs-orgmode@gnu.org; Thu, 26 Nov 2009 15:23:40 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDksK-0002VS-0P for emacs-orgmode@gnu.org; Thu, 26 Nov 2009 15:23:39 -0500 Received: from [199.232.76.173] (port=50775 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDksJ-0002VJ-Qd for emacs-orgmode@gnu.org; Thu, 26 Nov 2009 15:23:35 -0500 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:60512) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NDksI-0000ih-N7 for emacs-orgmode@gnu.org; Thu, 26 Nov 2009 15:23:35 -0500 Received: from cpe000102d0fe75-cm0012256ecbde.cpe.net.cable.rogers.com ([99.239.148.180] helo=mail.norang.ca) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1NDksF-000LLi-Um for emacs-orgmode@gnu.org; Thu, 26 Nov 2009 20:23:32 +0000 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org 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 -- 1.6.6.rc0.54.gb073b