Commit 824bbcd3 authored by Ulrik Haugen's avatar Ulrik Haugen
Browse files

Removed leftovers from old conflict.

parent a6d2b470
......@@ -3442,7 +3442,6 @@
* lyskom-rest.el (lyskom-a-or-b-or-c-p): New function. Generalized
y-or-n-p sort of.
>>>>>>> 44.678
2002-09-12 David Byers <byers@lysator.liu.se>
* english-strings.el,swedish-strings.el: Fixed speling error for
......
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