* Merge conflict markers in trunk/lisp/ldefs-boot.el causing compile failure
@ 2010-04-03 13:24 Jeff Kowalczyk
2010-04-03 14:03 ` Eli Zaretskii
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kowalczyk @ 2010-04-03 13:24 UTC (permalink / raw)
To: emacs-devel
Just an FYI, there are several merge conflict markers present in
lisp/ldefs-boot.el as of trunk r99820.
Loading /(...)/emacs-vcs-24.0.9999/lisp/ldefs-boot.el (source)...
Symbol's value as variable is void: <<<<<<<
# bzr update
Tree is up to date at revision 99820 of branch
http://bzr.savannah.gnu.org/r/emacs/trunk
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Merge conflict markers in trunk/lisp/ldefs-boot.el causing compile failure
2010-04-03 13:24 Merge conflict markers in trunk/lisp/ldefs-boot.el causing compile failure Jeff Kowalczyk
@ 2010-04-03 14:03 ` Eli Zaretskii
0 siblings, 0 replies; 2+ messages in thread
From: Eli Zaretskii @ 2010-04-03 14:03 UTC (permalink / raw)
To: Jeff Kowalczyk; +Cc: emacs-devel
> From: Jeff Kowalczyk <jtk@yahoo.com>
> Date: Sat, 3 Apr 2010 13:24:30 +0000 (UTC)
>
> Just an FYI, there are several merge conflict markers present in
> lisp/ldefs-boot.el as of trunk r99820.
Thanks, I think I fixed this.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-03 14:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-03 13:24 Merge conflict markers in trunk/lisp/ldefs-boot.el causing compile failure Jeff Kowalczyk
2010-04-03 14:03 ` Eli Zaretskii
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.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).