fix merge conflict

djeck1432 · Dec 22, 2024 · ef95f01 · ef95f01
2 parents f07e8a9 + 18e7209
commit ef95f01
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
@@ -21,7 +21,7 @@ import { TELEGRAM_BOT_LINK } from './utils/constants';
 import { useCheckMobile } from './hooks/useCheckMobile';
 import PositionHistory from './pages/position-history/PositionHistory';
 import WithdrawAll from 'pages/spotnet/dashboard/withdraw-all/WithdrawAll';
-
+import SpringDefiPage from 'pages/spotnet/defi-spring/Defi-spring';
 function App() {
   const { setWalletId, removeWalletId } = useWalletStore();
   const [showModal, setShowModal] = useState(false);