From 5382dd86417f9b0bef248be5a5b64367aeaae97b Mon Sep 17 00:00:00 2001
From: ArtFlag <aflageul@tuta.io>
Date: Fri, 11 Dec 2020 12:40:49 +0100
Subject: [PATCH] Fix merge conflict

---
 website/docs/sidebar.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/website/docs/sidebar.md b/website/docs/sidebar.md
index 736a266d4526..2a6424e01e13 100644
--- a/website/docs/sidebar.md
+++ b/website/docs/sidebar.md
@@ -301,3 +301,17 @@ module.exports = {
   },
 };
 ```
+
+## Passing custom props
+
+To pass in custom props to a swizzled sidebar item, add the optional `customProps` object to any of the items:
+
+```js
+{
+  type: 'doc';
+  id: 'doc1';
+  customProps: {
+    /* props */
+  }
+}
+```