docs: fix relnotes index

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

Fixes: 63f61b084a ("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>
This commit is contained in:
Eric Engestrom 2020-10-12 23:28:38 +02:00 committed by Marge Bot
parent c02e933de4
commit b04f57cb3d
1 changed files with 2 additions and 5 deletions

View File

@ -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