From 594bfe7c988107c6e6a84090aaeec8e56af205d1 Mon Sep 17 00:00:00 2001
From: Ryan Christoffersen <12519942+ryanchristo@users.noreply.github.com>
Date: Mon, 28 Jun 2021 14:34:48 -0700
Subject: [PATCH 1/2] docs: add v0.43 version option (#9506)

Co-authored-by: ryanchrypto <12519942+ryanchrypto@users.noreply.github.com>
(cherry picked from commit 325dabd83c66c23a1f2320783de552a14090a086)

# Conflicts:
#	docs/versions
---
 docs/.vuepress/config.js | 4 ++++
 docs/versions            | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index a7e732c67224..223d2d91aa8b 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -46,6 +46,10 @@ module.exports = {
         "label": "v0.42",
         "key": "v0.42"
       },
+      {
+        "label": "v0.43",
+        "key": "v0.43"
+      },
       {
         "label": "master",
         "key": "master"
diff --git a/docs/versions b/docs/versions
index d5dc85eb286f..5c8986c3b9e4 100644
--- a/docs/versions
+++ b/docs/versions
@@ -1,2 +1,7 @@
 master              master
 launchpad/backports v0.39
+<<<<<<< HEAD
+=======
+release/v0.42.x     v0.42
+release/v0.43.x     v0.43
+>>>>>>> 325dabd83 (docs: add v0.43 version option (#9506))

From 8394fd4adec71c8344f7b78bc5ea214c665f59b4 Mon Sep 17 00:00:00 2001
From: Amaury M <1293565+amaurym@users.noreply.github.com>
Date: Mon, 12 Jul 2021 10:40:23 +0200
Subject: [PATCH 2/2] fix conflicts

---
 docs/versions | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/versions b/docs/versions
index 5c8986c3b9e4..d01230080817 100644
--- a/docs/versions
+++ b/docs/versions
@@ -1,7 +1,4 @@
 master              master
 launchpad/backports v0.39
-<<<<<<< HEAD
-=======
 release/v0.42.x     v0.42
 release/v0.43.x     v0.43
->>>>>>> 325dabd83 (docs: add v0.43 version option (#9506))