resolve conflict

visoftsolutions · Nov 5, 2023 · 44e2025 · 44e2025
1 parent 431a0f9
commit 44e2025
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/web/src/app/chats/public/page.tsx b/web/src/app/chats/public/page.tsx
@@ -17,7 +17,6 @@ import {BiDollar} from 'react-icons/bi';
 import axios from "axios";
 
 export default function Profile({ params }: { params: { address: string } }) {
-  const [chat, setChat] = useState<"public" | "private">("public");
   const [myMessages, setMyMessages] = useState<
     {
       id: number;

diff --git a/web/src/context/wallet.tsx b/web/src/context/wallet.tsx
@@ -18,11 +18,7 @@ export interface WalletContext {
 const WalletContext = createContext<{
   walletContext: WalletContext;
   setWalletContext: (value: WalletContext) => void;
-<<<<<<< HEAD
-    }>({ walletContext: {}, setWalletContext: () => {} });
-=======
 } | undefined>(undefined);
->>>>>>> c96567f (contexts)
 
 export const useWalletContext = () => useContext(WalletContext);