Mercurial > emacs
diff mac/inc/config.h @ 70883:910efa724a98
Remove conflict indicators.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Wed, 24 May 2006 14:25:50 +0000 |
parents | fd42e9250d3e |
children | 4cbbf2d7c486 c156f6a9e7b5 |
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Wed, 24 May 2006 14:25:50 +0000 |
parents | fd42e9250d3e |
children | 4cbbf2d7c486 c156f6a9e7b5 |