Commit 8acf46dd authored by Per Abrahamsen's avatar Per Abrahamsen

merge fix

parent f4990970
......@@ -261,7 +261,6 @@
* cus-start.el (x-use-underline-position-properties):
Allow customization.
>>>>>>> 1.3434
2002-02-04 Simon Josefsson <jas@extundo.com>
* dired.el (dired-load-hook, dired-mode-hook)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment