chore: resolve conflict

Mississippi-Labs · Oct 16, 2023 · 1b9e8ae · 1b9e8ae
1 parent 5fa4827
commit 1b9e8ae
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx
@@ -11,10 +11,7 @@ export const App = () => {
       <BrowserRouter>
         <Routes>
           <Route path="/">
-<<<<<<< HEAD
-=======
             {/*<Route index element={<Game />} />*/}
->>>>>>> 79480b45a422439a77d4380ef42b0c72297f51a7
             <Route index element={<Home />} />
             <Route path="game" element={<Game />} />
             <Route path="test" element={<Test />} />

diff --git a/packages/client/src/mud/createSystemCalls.ts b/packages/client/src/mud/createSystemCalls.ts
@@ -19,10 +19,6 @@ export function createSystemCalls(
   };
 
   const move = async (steps) => {
-<<<<<<< HEAD
-    console.log('move', steps)
-    const tx = await worldContract.write.move([steps]);
-=======
     console.log(worldContract)
     const tx = await worldContract.write.move([steps]);
     await waitForTransaction(tx);
@@ -38,7 +34,6 @@ export function createSystemCalls(
     const result = await waitForTransaction(tx);
     console.log(result);
     // return getComponentValue(GameSystem, singletonEntity);
->>>>>>> 79480b45a422439a77d4380ef42b0c72297f51a7
     await waitForTransaction(tx);
   };
 
@@ -50,10 +45,7 @@ export function createSystemCalls(
   return {
     increment,
     move,
-<<<<<<< HEAD
-=======
     getPosition,
->>>>>>> 79480b45a422439a77d4380ef42b0c72297f51a7
     joinBattlefield
   };
 }