Commit 17940e52 authored by Ian McKellar's avatar Ian McKellar
Browse files

(removing a conflict marker)

parent 40781c05
...@@ -384,7 +384,6 @@ Thu Feb 22 04:13:13 2001 George Lebl <jirka@5z.com> ...@@ -384,7 +384,6 @@ Thu Feb 22 04:13:13 2001 George Lebl <jirka@5z.com>
downgrade at the same time, since it's perfectly capable of doing downgrade at the same time, since it's perfectly capable of doing
that (covering all bases) and it's useful to labs. that (covering all bases) and it's useful to labs.
>>>>>>> 1.3885
2001-02-22 Arlo Rose <arlo@eazel.com> 2001-02-22 Arlo Rose <arlo@eazel.com>
* icons/druid_header.png: * icons/druid_header.png:
......
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