From dba8c4a9750ededdb2198165abaa956cb8527657 Mon Sep 17 00:00:00 2001
From: lq <3298408835@qq.com>
Date: Wed, 11 Dec 2024 16:41:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/Script/UI/TemplateInfo.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/xiaofang/Assets/Script/UI/TemplateInfo.cs b/xiaofang/Assets/Script/UI/TemplateInfo.cs
index 6a15024e..6589bc6e 100644
--- a/xiaofang/Assets/Script/UI/TemplateInfo.cs
+++ b/xiaofang/Assets/Script/UI/TemplateInfo.cs
@@ -5,17 +5,7 @@ using UnityEngine.UI;
 
 public class TemplateInfo : MonoBehaviour
 {
-<<<<<<< HEAD
     public Text templateText;
-=======
-//<<<<<<< HEAD:xiaofang/Assets/Script/hylScripts/Free01/NetPings.cs
-
-
-//=======
-    public Text templateText;
-//>>>>>>> e0ef89a8cfb64341378541f16f1e9f5cffbc01eb:xiaofang/Assets/Script/UI/TemplateInfo.cs
-    // Start is called before the first frame update
->>>>>>> f0b9f206aabafd00c78d6374b48d4057bbe57cf6
     void Start()
     {