Mercurial > emacs
diff src/doc.c @ 62973:b89ed3c14158
Remove conflict marker.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Fri, 03 Jun 2005 14:18:31 +0000 |
parents | 1f66922e7ad0 |
children | a8fa7c632ee4 29e773288013 |
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Fri, 03 Jun 2005 14:18:31 +0000 |
parents | 1f66922e7ad0 |
children | a8fa7c632ee4 29e773288013 |