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/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
 	}
 }