loaf/idle_moloch
1
0
Fork 0
forked from mico/idle_moloch
Code Pull Requests Activity

Fixes botched merge

Browse Source
This commit is contained in:
mic0 2024-10-28 22:10:07 +01:00
parent 41ec092f09
commit d64f98c0d4
Signed by: mico
GPG Key ID: A3F8023524CF1C8D
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/pages/_app.tsx
View File

@ -1,15 +1,3 @@
<<<<<<< HEAD
import '../styles/globals.css';
import '@rainbow-me/rainbowkit/styles.css';
import type { AppProps } from 'next/app';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { WagmiProvider } from 'wagmi';
import { RainbowKitProvider, midnightTheme } from '@rainbow-me/rainbowkit';
import { config } from '../wagmi';
import { Texturina } from 'next/font/google'
import PlayerProvider from '../providers/PlayerProvider';
import ModalProvider from '../providers/ModalProvider';
=======
import "../styles/globals.css"; import "../styles/globals.css";
import "../styles/pixelatedBorders.scss"; import "../styles/pixelatedBorders.scss";
import "@rainbow-me/rainbowkit/styles.css"; import "@rainbow-me/rainbowkit/styles.css";
@ -20,7 +8,8 @@ import { RainbowKitProvider, midnightTheme } from "@rainbow-me/rainbowkit";
import { config } from "../wagmi"; import { config } from "../wagmi";
import { Press_Start_2P, Texturina } from "next/font/google"; import { Press_Start_2P, Texturina } from "next/font/google";
import PlayerProvider from "../providers/PlayerProvider"; import PlayerProvider from "../providers/PlayerProvider";
>>>>>>> main import ModalProvider from '../providers/ModalProvider';
const client = new QueryClient(); const client = new QueryClient();
const font = Texturina({ weight: ["400"], subsets: ["latin"] }); const font = Texturina({ weight: ["400"], subsets: ["latin"] });