From 6289bcbd0ff324af85fe7d839f42d63a905cdfa0 Mon Sep 17 00:00:00 2001
From: yoosangwook <yoo32767@gmail.com>
Date: Thu, 27 Jun 2024 12:31:28 +0900
Subject: [PATCH] Resolve conflict

---
 src/hooks/useMode.js | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/hooks/useMode.js b/src/hooks/useMode.js
index bb04c72a..5716f34e 100644
--- a/src/hooks/useMode.js
+++ b/src/hooks/useMode.js
@@ -367,16 +367,11 @@ export function useMode() {
     // 새로운 다각형 객체를 캔버스에 추가합니다.
     canvas.add(polygon)
 
-<<<<<<< Updated upstream
-    console.log(polygon.getPoints())
-
-    polygon.fillCell()
-=======
     // 캔버스를 다시 그립니다.
     if(!otherLines) {
+      polygon.fillCell()
       canvas.renderAll()
     }
->>>>>>> Stashed changes
   }
 
   /**
@@ -389,7 +384,6 @@ export function useMode() {
     historyLines.current = []
   }
 
-<<<<<<< Updated upstream
   const zoomIn = () => {
     canvas?.setZoom(canvas.getZoom() + 0.1)
     setZoom(Math.round(zoom + 10))
@@ -400,16 +394,6 @@ export function useMode() {
     setZoom(Math.ceil(zoom - 10))
   }
 
-  return {
-    mode,
-    changeMode,
-    setCanvas,
-    handleClear,
-    zoomIn,
-    zoomOut,
-    zoom,
-  }
-=======
   const handleOuterlines = () => {
     const newOuterlines = []
     for(let i = 0; i < historyLines.current.length; i++) {
@@ -491,6 +475,13 @@ export function useMode() {
     makePolygon(newOuterlines)
   }
 
-  return { mode, changeMode, setCanvas, handleClear }
->>>>>>> Stashed changes
+  return {
+    mode,
+    changeMode,
+    setCanvas,
+    handleClear,
+    zoomIn,
+    zoomOut,
+    zoom,
+  }
 }