diff options
| -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> |