diff lisp/bookmark.el @ 91450:afc545f3960e

Remove conflict marker and merged entries about re-generating config.in.
author Glenn Morris <rgm@gnu.org>
date Sat, 02 Feb 2008 04:47:40 +0000
parents 0c4a74c24677
children 606f2d163a64 4170d4a36502
line wrap: on
line diff