From 343acf39be1df4566259313c9faa4343600783b9 Mon Sep 17 00:00:00 2001
From: qup35p <0528angelina@gmail.com>
Date: Wed, 19 Nov 2025 12:23:17 +0800
Subject: [PATCH] =?UTF-8?q?<=E7=A2=BA=E8=AA=8Dseverworkscene=E7=84=A1?=
 =?UTF-8?q?=E8=A1=9D=E7=AA=81>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scenes/Server/ServerWorkScene.unity | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Assets/Scenes/Server/ServerWorkScene.unity b/Assets/Scenes/Server/ServerWorkScene.unity
index f13b88c..ac64287 100644
--- a/Assets/Scenes/Server/ServerWorkScene.unity
+++ b/Assets/Scenes/Server/ServerWorkScene.unity
@@ -6055,7 +6055,6 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1887351187}
   m_HandleRect: {fileID: 1887351186}
   m_Direction: 2
-<<<<<<< HEAD
   m_Value: 1.0000005
   m_Size: 0.79486334
   m_NumberOfSteps: 0
@@ -13947,7 +13946,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 994591509}
   m_CullTransparentMesh: 1
-<<<<<<< HEAD
 
 --- !u!1 &1005195137
 GameObject: