Commit d58fa91a authored by Anders Carlsson's avatar Anders Carlsson

Remove conflict markers

parent 1ab16a8b
......@@ -44,7 +44,6 @@
* docs/use-cases.txt:
Tweak some documents, removing obsolete ones.
>>>>>>> 1.4866
2001-12-06 Darin Adler <darin@bentspoon.com>
* components/Makefile.am:
......
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