From c781e2841a25aeecac2f9af1a31ce129a530d796 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 5 Mar 2010 17:32:07 -0700 Subject: docs: remove merge conflict garbage --- docs/relnotes.html | 1 - 1 file changed, 1 deletion(-) (limited to 'docs') 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.