From 478f6dca99b5118cbe5403fd26f4d1d78d0560c3 Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Wed, 25 Sep 2024 13:04:19 +0800
Subject: [PATCH] Changes fix merge

---
 common/inline_scripts/events/rg_test_gray_skill_varible.txt | 3 ---
 common/scripted_triggers/RG_scripted_triggers.txt           | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/common/inline_scripts/events/rg_test_gray_skill_varible.txt b/common/inline_scripts/events/rg_test_gray_skill_varible.txt
index 7563980..51d56d3 100644
--- a/common/inline_scripts/events/rg_test_gray_skill_varible.txt
+++ b/common/inline_scripts/events/rg_test_gray_skill_varible.txt
@@ -8,7 +8,6 @@ set_variable = {
 #Country event_target:gray_owner
 #存储当前领袖等级
 rg_save_gray_leader_level_effect = {
-<<<<<<< HEAD
     every_owned_leader = {
         if = {
             ###等级检测
@@ -34,7 +33,6 @@ rg_save_gray_leader_level_effect = {
         }
     }
 }
-=======
     random_owned_leader = {
 		#是小灰领袖
 		limit = {
@@ -58,7 +56,6 @@ check_variable = {
 	which = rg_gray_level
 	value >= 10
 }
->>>>>>> RG_AG_TEST
 
 #Country event_target:gray_owner
 #等级导入，把存储的领袖等级赋予到领袖身上
diff --git a/common/scripted_triggers/RG_scripted_triggers.txt b/common/scripted_triggers/RG_scripted_triggers.txt
index da653ba..fc039d1 100644
--- a/common/scripted_triggers/RG_scripted_triggers.txt
+++ b/common/scripted_triggers/RG_scripted_triggers.txt
@@ -70,15 +70,14 @@ rg_is_main_species_with_maid_trait_trigger = {
 	}
 }
 
-<<<<<<< HEAD
 RG_tradition5_or_gray_owner_trigger = {
 	OR = {
 		RG_gray_harbitat_active_trigger = yes
 		has_active_tradition = tr_rg_nanotech_5
-=======
+	}
+}
 rg_has_ag_origin_trigger = {
 	any_country = {
 		has_origin = origin_Asgray
->>>>>>> RG_AG_TEST
 	}
 }
\ No newline at end of file