diff options
author | Brian Paul <[email protected]> | 2010-03-05 17:32:07 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2010-03-05 17:32:07 -0700 |
commit | c781e2841a25aeecac2f9af1a31ce129a530d796 (patch) | |
tree | 2a87d7af0b9552075fae8c4c369a049dfbc53a20 | |
parent | 77fc3ef9116fae6b8b53cda78d97c4ff1ec5c171 (diff) |
docs: remove merge conflict garbage
-rw-r--r-- | docs/relnotes.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/relnotes.html b/docs/relnotes.html index f1f95c5d3ca..3e17a1e94ee 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -13,7 +13,6 @@ The release notes summarize what's new or changed in each Mesa release. </p> <UL> -<<<<<<< HEAD:docs/relnotes.html <LI><A HREF="relnotes-7.8.html">7.8 release notes</A> <LI><A HREF="relnotes-7.7.1.html">7.7.1 release notes</A> <LI><A HREF="relnotes-7.7.html">7.7 release notes</A> |