Mercurial > emacs
diff configure @ 62973:b89ed3c14158
Remove conflict marker.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Fri, 03 Jun 2005 14:18:31 +0000 |
parents | dc112019132f |
children | 77fa0f6c686d 21eea50897a7 f042e7c0fe20 |
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Fri, 03 Jun 2005 14:18:31 +0000 |
parents | dc112019132f |
children | 77fa0f6c686d 21eea50897a7 f042e7c0fe20 |