all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Timothy Larkin <tsl1@cornell.edu>
Subject: Re: Building on OS X
Date: Fri, 27 Dec 2002 10:00:11 -0500	[thread overview]
Message-ID: <tsl1-7FA5DE.10001127122002@newsstand.cit.cornell.edu> (raw)
In-Reply-To: tsl1-557673.10034226122002@newsstand.cit.cornell.edu

The problem has turned out to be the presence in 3 files of the lines

<<<<<<< darwin.h
=======
>>>>>>> 1.10

either in sequence or in close proximity.  Any idea why these lines 
should appear?  They appear, for instance, in <darwin.h>, and I know 
they are not legal C code.

Tim Larkin
Abstract Tools
Caroline, NY

  parent reply	other threads:[~2002-12-27 15:00 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-12-26 15:03 Building on OS X Timothy Larkin
2002-12-26 15:52 ` Kai Großjohann
2002-12-26 16:58   ` Hugo Wolf
2002-12-27 15:00 ` Timothy Larkin [this message]
2002-12-27 15:27   ` Raphaël Berbain
2002-12-27 15:41   ` Rodney Sparapani
2002-12-27 20:22   ` Kai Großjohann

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=tsl1-7FA5DE.10001127122002@newsstand.cit.cornell.edu \
    --to=tsl1@cornell.edu \
    /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.