[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merge conflict markers in trunk/lisp/ldefs-boot.el causing compile f
|
From: |
Eli Zaretskii |
|
Subject: |
Re: Merge conflict markers in trunk/lisp/ldefs-boot.el causing compile failure |
|
Date: |
Sat, 03 Apr 2010 17:03:27 +0300 |
> From: Jeff Kowalczyk <address@hidden>
> 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.