Commit f76f0f89 by Andreas Schwab

Remove conflict marker.

From-SVN: r86312
parent a9024779
......@@ -45,7 +45,6 @@
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
>>>>>>> 1.967
2004-08-13 Brian Booth <bbooth@redhat.com>
* MAINTAINERS: Remove myself from write-after-approval.
......
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