Mercurial > emacs
diff COPYING @ 63651:26ce1e6e98e5
Remove conflict markers.
author | Lute Kamstra <lute@gnu.org> |
---|---|
date | Wed, 22 Jun 2005 07:36:03 +0000 |
parents | a21a2f14a765 |
children | d92149473c34 |
author | Lute Kamstra <lute@gnu.org> |
---|---|
date | Wed, 22 Jun 2005 07:36:03 +0000 |
parents | a21a2f14a765 |
children | d92149473c34 |