Remove conflict marker.
From-SVN: r86312
This commit is contained in:
parent
a9024779f1
commit
f76f0f890d
1 changed files with 0 additions and 1 deletions
|
@ -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.
|
||||
|
|
Loading…
Add table
Reference in a new issue