Mercurial > emacs
diff src/scroll.c @ 43140:d3e6cbd3895e
Remove traces of merge conflicts.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Wed, 06 Feb 2002 16:24:25 +0000 |
parents | 5f60884970a8 |
children | 3aa5ba8c3ef4 f814744c5774 |
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Wed, 06 Feb 2002 16:24:25 +0000 |
parents | 5f60884970a8 |
children | 3aa5ba8c3ef4 f814744c5774 |