From: Brian Paul <brianp@vmware.com>
Date: Sat, 6 Mar 2010 00:32:07 +0000 (-0700)
Subject: docs: remove merge conflict garbage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c781e2841a25aeecac2f9af1a31ce129a530d796;p=mesa.git

docs: remove merge conflict garbage
---

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>