From e87aaf97a08b5cffcb46a811e8ebc0e4b6d7f5e7 Mon Sep 17 00:00:00 2001
From: TippingGame <tippinggame@163.com>
Date: Sun, 9 Mar 2025 14:30:00 +0800
Subject: [PATCH] =?UTF-8?q?1.3.112=201.=E5=B0=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E5=96=84=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 5 -----
 package.json | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04b2610..eba7d48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,10 @@
 # Changelog
 
-<<<<<<< HEAD
 ## [1.3.112] - 2025-03-09
 1.小优化，完善文档  
 
-## [1.3.111] - 2025-03-06
-1.#32 修复ResourcesLoader中的三目运算符使用错误  
-=======
 ## [1.3.111] - 2025-03-06
 1.#33 修复ResourcesLoader中的三目运算符使用错误，this.subAssetName赋值，优化代码  
->>>>>>> d979be685c136e8ab1f0d0cf28d7a62b66ba5250
 
 ## [1.3.110] - 2025-03-06
 1.#32 的优化  
diff --git a/package.json b/package.json
index 5520ea4..80a8289 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,7 @@
   "name": "com.tippinggame.f8framework",
   "displayName": "F8Framework",
   "description": "Unity F8Framework Core",
-<<<<<<< HEAD
   "version": "1.3.112",
-=======
-  "version": "1.3.111",
->>>>>>> d979be685c136e8ab1f0d0cf28d7a62b66ba5250
   "unity": "2021.3",
   "license": "MIT",
   "keywords": ["Unity", "Framework", "Core"],