From 18424b10099b4fe0557d17ed1b8744086695b00d Mon Sep 17 00:00:00 2001
From: adtpdn <adtpdn@gmail.com>
Date: Fri, 24 Apr 2026 00:52:27 +0800
Subject: [PATCH] feat : broken

---
 CHANGELOG_DRAFT.md       | 4 ----
 assets/data/version.json | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/CHANGELOG_DRAFT.md b/CHANGELOG_DRAFT.md
index e147713..be3d969 100644
--- a/CHANGELOG_DRAFT.md
+++ b/CHANGELOG_DRAFT.md
@@ -1,10 +1,6 @@
 ## [NEXT]
 
-<<<<<<< HEAD
 ## [2.1.6] — 2026-04-24
-=======
-## [2.1.6] — 2026-04-23
->>>>>>> 2263841b1ab67052596ad5d6e68e3ed413660040
 - Added Gacha system with Star and Gold banners (1x & 10x pulls)
 - Fragment Craft system — collect drops to craft exclusive skins
 - Fixed boot screen stuck on "Checking versions..."
diff --git a/assets/data/version.json b/assets/data/version.json
index f5774c4..a4044a7 100644
--- a/assets/data/version.json
+++ b/assets/data/version.json
@@ -4,20 +4,12 @@
 	"releases": [
 		{
 			"version": "2.1.6",
-<<<<<<< HEAD
 			"date": "2026-04-24",
-=======
-			"date": "2026-04-23",
->>>>>>> 2263841b1ab67052596ad5d6e68e3ed413660040
 			"pck_url": "https://raw.githubusercontent.com/adtpdn/tekton-updates/main/latest/patch.pck",
 			"pck_size": 0,
 			"changelog": [
 				"Added Gacha system with Star and Gold banners (1x & 10x pulls)",
-<<<<<<< HEAD
 				"Fragment Craft system — collect drops to craft exclusive skins",
-=======
-				"Fragment Craft system \u2014 collect drops to craft exclusive skins",
->>>>>>> 2263841b1ab67052596ad5d6e68e3ed413660040
 				"Fixed boot screen stuck on \"Checking versions...\""
 			]
 		},