From 88546b363b789345e8a2b04660a4e6909940af18 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Fri, 13 Sep 2024 17:29:01 +0700
Subject: [PATCH] 891 => 892

---
 xml_main/startup.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index f064d4bd..1c9808ec 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,13 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-<<<<<<< HEAD
 	Var XMLPageVersion = "8.92"
 	Var XMLPageVersionInt = 892
-=======
-	Var XMLPageVersion = "8.91"
-	Var XMLPageVersionInt = 891
->>>>>>> 2056d9a5c4d5969c7c875c78137b83fd4d1eb872
 ;Oreo
 Var OreoGuarantee = 0