From 608551c04add834d4db2e6b573bcfd4f33478d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Bl=C3=A4ttermann?= <marcus@essenmitsosse.de>
Date: Tue, 29 Nov 2022 12:25:10 +0100
Subject: [PATCH] Fix ESLint `react/jsx-no-duplicate-props`

---
 website/src/widgets/quickstart-training.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/website/src/widgets/quickstart-training.js b/website/src/widgets/quickstart-training.js
index fbeeaf79d..f39617845 100644
--- a/website/src/widgets/quickstart-training.js
+++ b/website/src/widgets/quickstart-training.js
@@ -104,6 +104,7 @@ export default function QuickstartTraining({ id, title, download = 'base_config.
         .map(line => (line.startsWith('#') ? `<span class="token comment">${line}</span>` : line))
         .join('\n')
     return (
+<<<<<<< Updated upstream
         <StaticQuery
             query={query}
             render={({ site }) => {
@@ -122,7 +123,6 @@ export default function QuickstartTraining({ id, title, download = 'base_config.
                 }
                 return (
                     <Quickstart
-                        id="quickstart-widget"
                         Container="div"
                         download={download}
                         rawContent={rawContent}
@@ -139,6 +139,22 @@ export default function QuickstartTraining({ id, title, download = 'base_config.
                 )
             }}
         />
+=======
+        <Quickstart
+            Container="div"
+            download={download}
+            rawContent={rawContent}
+            data={data}
+            title={title}
+            id={id}
+            setters={setters}
+            hidePrompts
+            small
+            codeLang="ini"
+        >
+            {htmlToReact(displayContent)}
+        </Quickstart>
+>>>>>>> Stashed changes
     )
 }