From 1b9e8ae58e0cdb2d472d2886bbe586f5ecfe48bb Mon Sep 17 00:00:00 2001
From: lewis <>
Date: Tue, 17 Oct 2023 00:20:08 +0800
Subject: [PATCH] chore: resolve conflict

---
 packages/client/src/App.tsx                  | 3 ---
 packages/client/src/mud/createSystemCalls.ts | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx
index 5eace64a..599323be 100644
--- 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
index 226f1fe5..924bf320 100644
--- 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
   };
 }