From b04f57cb3da73f3dab26a5f0c5ddc0055df20ba9 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@engestrom.ch>
Date: Mon, 12 Oct 2020 23:28:38 +0200
Subject: [PATCH] docs: fix relnotes index

Add missing `.0` to 20.2.0 and fix bad merge.

Fixes: 63f61b084a5310c58eaf ("docs: update calendar and link releases notes for 20.2")
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7107>
---
 docs/relnotes.rst | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/relnotes.rst b/docs/relnotes.rst
index 91af84cc359..6033b251c81 100644
--- a/docs/relnotes.rst
+++ b/docs/relnotes.rst
@@ -3,8 +3,8 @@ Release Notes
 
 The release notes summarize what's new or changed in each Mesa release.
 
+-  :doc:`20.2.0 release notes <relnotes/20.2.0>`
 -  :doc:`20.1.9 release notes <relnotes/20.1.9>`
--  :doc:`20.2 release notes <relnotes/20.2>`
 -  :doc:`20.1.8 release notes <relnotes/20.1.8>`
 -  :doc:`20.1.7 release notes <relnotes/20.1.7>`
 -  :doc:`20.1.6 release notes <relnotes/20.1.6>`
@@ -316,11 +316,8 @@ file <versions>` and the following release notes.
    :maxdepth: 1
    :hidden:
 
-<<<<<<< HEAD
+   relnotes/20.2.0
    relnotes/20.1.9
-=======
-   relnotes/20.2
->>>>>>> ad127a5b333... docs: update calendar and link releases notes for 20.2
    relnotes/20.1.8
    relnotes/20.1.7
    relnotes/20.1.6