resolve conflict

This commit is contained in:
none
2023-03-03 13:56:29 +08:00
parent 94ee5b9f0a
commit 233e7d904e
5 changed files with 11 additions and 21 deletions

View File

@@ -1,4 +1,3 @@
import React from "react";
import ReactDOM from "react-dom/client";
import "./index.less";
import App from "./App";
@@ -7,12 +6,14 @@ import { BrowserRouter } from "react-router-dom";
import { Provider } from "react-redux";
import store from "./store/store";
const basename = process.env.REACT_BASE_NAME || "";
const root = ReactDOM.createRoot(
document.getElementById("root") as HTMLElement
);
root.render(
<Provider store={store}>
<BrowserRouter>
<BrowserRouter basename={basename}>
<App />
</BrowserRouter>
</Provider>