progs/egl: Add an OpenGL ES demo for EGL_OES_image_pixmap.

[mesa.git] / docs / relnotes.html

diff --git a/docs/relnotes.html b/docs/relnotes.html
index f1f95c5d3cad184ddc8ce3c5cbd7cf71d64c49e5..3e17a1e94eebd6493dff5428c1667fbb0f5004e2 100644 (file)
--- 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>