Mercurial > emacs
diff configure.in @ 46515:272c43ada087
Remove conflict marker.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Thu, 18 Jul 2002 09:42:56 +0000 |
parents | 512f33c6eec6 |
children | 5698ad4e8a2b |
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Thu, 18 Jul 2002 09:42:56 +0000 |
parents | 512f33c6eec6 |
children | 5698ad4e8a2b |