diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index 864f7164..da8ac983 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -7110,7 +7110,6 @@ cn_targu_mures:0 "Târgu Mureș" cn_regen:0 "Regen" cn_reghin:0 "Reghin" -<<<<<<< HEAD cn_hunyad:0 "Hunyad" cn_hunyad_adj:0 "Hunyadi" cn_petroschen:0 "Petroschen"