Mercurial > emacs
diff lisp/generic-x.el @ 62560:56541edc86ad
Remove CVS conflict markers.
author | Reiner Steib <Reiner.Steib@gmx.de> |
---|---|
date | Fri, 20 May 2005 17:47:03 +0000 |
parents | 0f01cf50bf81 |
children | 2624ddc5a43f f042e7c0fe20 |
author | Reiner Steib <Reiner.Steib@gmx.de> |
---|---|
date | Fri, 20 May 2005 17:47:03 +0000 |
parents | 0f01cf50bf81 |
children | 2624ddc5a43f f042e7c0fe20 |