From b0cb432522cb29fd228917e557adc04b3d2bf286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.com>
Date: Tue, 10 Oct 2023 10:35:03 +0200
Subject: [PATCH] Resolve conflict

---
 web/src/index.js | 62 ++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/web/src/index.js b/web/src/index.js
index 639d8cad2d..5585cbd8c0 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -39,8 +39,6 @@ import "@patternfly/patternfly/patternfly-base.scss";
 import App from "~/App";
 import Main from "~/Main";
 import DevServerWrapper from "~/DevServerWrapper";
-import L10nWrapper from "~/L10nWrapper";
-import L10nBackendWrapper from "~/L10nBackendWrapper";
 import { Overview } from "~/components/overview";
 import { ProductSelectionPage, SoftwarePage } from "~/components/software";
 import { ProposalPage as StoragePage, ISCSIPage, DASDPage, ZFCPPage } from "~/components/storage";
@@ -73,36 +71,32 @@ const container = document.getElementById("root");
 const root = createRoot(container);
 
 root.render(
-  <L10nWrapper>
-    <LoginWrapper>
-      <InstallerClientProvider client={createClient}>
-        <L10nBackendWrapper>
-          <SoftwareProvider>
-            <NotificationProvider>
-              <HashRouter>
-                <Routes>
-                  <Route path="/" element={<App />}>
-                    <Route path="/" element={<Main />}>
-                      <Route index element={<Overview />} />
-                      <Route path="/overview" element={<Overview />} />
-                      <Route path="/l10n" element={<L10nPage />} />
-                      <Route path="/software" element={<SoftwarePage />} />
-                      <Route path="/storage" element={<StoragePage />} />
-                      <Route path="/storage/iscsi" element={<ISCSIPage />} />
-                      <Route path="/storage/dasd" element={<DASDPage />} />
-                      <Route path="/storage/zfcp" element={<ZFCPPage />} />
-                      <Route path="/network" element={<NetworkPage />} />
-                      <Route path="/users" element={<UsersPage />} />
-                      <Route path="/issues" element={<IssuesPage />} />
-                    </Route>
-                    <Route path="products" element={<ProductSelectionPage />} />
-                  </Route>
-                </Routes>
-              </HashRouter>
-            </NotificationProvider>
-          </SoftwareProvider>
-        </L10nBackendWrapper>
-      </InstallerClientProvider>
-    </LoginWrapper>
-  </L10nWrapper>
+  <LoginWrapper>
+    <InstallerClientProvider client={createClient}>
+      <SoftwareProvider>
+        <NotificationProvider>
+          <HashRouter>
+            <Routes>
+              <Route path="/" element={<App />}>
+                <Route path="/" element={<Main />}>
+                  <Route index element={<Overview />} />
+                  <Route path="/overview" element={<Overview />} />
+                  <Route path="/l10n" element={<L10nPage />} />
+                  <Route path="/software" element={<SoftwarePage />} />
+                  <Route path="/storage" element={<StoragePage />} />
+                  <Route path="/storage/iscsi" element={<ISCSIPage />} />
+                  <Route path="/storage/dasd" element={<DASDPage />} />
+                  <Route path="/storage/zfcp" element={<ZFCPPage />} />
+                  <Route path="/network" element={<NetworkPage />} />
+                  <Route path="/users" element={<UsersPage />} />
+                  <Route path="/issues" element={<IssuesPage />} />
+                </Route>
+                <Route path="products" element={<ProductSelectionPage />} />
+              </Route>
+            </Routes>
+          </HashRouter>
+        </NotificationProvider>
+      </SoftwareProvider>
+    </InstallerClientProvider>
+  </LoginWrapper>
 );