summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-03-08 11:43:20 -0700
committerBrian Paul <brianp@vmware.com>2010-03-08 11:43:20 -0700
commite5923a1240d8b32f5af080b0b4191d3b9299a630 (patch)
treeb186ab69c91eeb1be91c9f3705db82fead819728 /docs
parent39ab5ae30c303dd561252cb592d4de35814b6a70 (diff)
parente1762fb870f86afc4f6bd000b4a1c059d161f10d (diff)
Merge branch '7.8'
Diffstat (limited to 'docs')
-rw-r--r--docs/relnotes.html1
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>