Changes fix merge

2024-09-25 13:04:19 +08:00
parent 8e248545f1
commit 478f6dca99
2 changed files with 2 additions and 6 deletions
--- 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
 #等级导入，把存储的领袖等级赋予到领袖身上