comparison src/buffer.h @ 43140:d3e6cbd3895e

Remove traces of merge conflicts.
author Eli Zaretskii <eliz@gnu.org>
date Wed, 06 Feb 2002 16:24:25 +0000
parents 7cc52563d4fd
children f15b9906481d 7b6dd9fc65ad
comparison
equal deleted inserted replaced
43139:22ff542d67ee 43140:d3e6cbd3895e