From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: [OSX] bootstrap fails Date: Mon, 14 Mar 2005 16:32:20 +0000 Message-ID: <4235BC94.3050300@gnu.org> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit X-Trace: sea.gmane.org 1110819169 6968 80.91.229.2 (14 Mar 2005 16:52:49 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 14 Mar 2005 16:52:49 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 14 17:52:49 2005 Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DAsd8-00072L-4U for ged-emacs-devel@m.gmane.org; Mon, 14 Mar 2005 17:41:22 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DAsso-0007fy-Nb for ged-emacs-devel@m.gmane.org; Mon, 14 Mar 2005 11:57:35 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DAsra-0007Pn-4H for emacs-devel@gnu.org; Mon, 14 Mar 2005 11:56:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DAsrW-0007Oe-Ew for emacs-devel@gnu.org; Mon, 14 Mar 2005 11:56:17 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DAsrW-0007No-3M for emacs-devel@gnu.org; Mon, 14 Mar 2005 11:56:14 -0500 Original-Received: from [217.207.198.106] (helo=exchange.integrasp.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DAsUN-00024h-BO for emacs-devel@gnu.org; Mon, 14 Mar 2005 11:32:19 -0500 Original-Received: from ASSP-nospam (localhost [127.0.0.1]) by exchange.integrasp.com with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13) id G29YBL9X; Mon, 14 Mar 2005 16:31:44 -0000 Original-Received: from 217.205.90.2 ([217.205.90.2] helo=[10.10.5.77]) by ASSP-nospam ; 14 Mar 05 16:31:44 -0000 User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en Original-To: =?ISO-8859-1?Q?S=E9bastien_Kirche?= In-Reply-To: X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org X-MailScanner-To: ged-emacs-devel@m.gmane.org Xref: news.gmane.org gmane.emacs.devel:34579 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:34579 Sébastien Kirche wrote: >Little grepping shows some weird comment at line 286 of lisp/startup.el ><<<<<<< startup.el > >and also «=======» at line 299 > >Maybe some unproper patch ? > > > Looks like a CVS conflict marker. Did you make a local change to startup.el?