From 14fdf4c06e86d7991fd2c77c97aa2f12498047a2 Mon Sep 17 00:00:00 2001
From: metamaskbot <metamaskbot@users.noreply.github.com>
Date: Tue, 3 Sep 2024 15:46:14 -0600
Subject: [PATCH] fix audit and locals parsing

---
 .iyarc                    |  1 -
 locales/languages/ru.json | 14 --------------
 2 files changed, 15 deletions(-)

diff --git a/.iyarc b/.iyarc
index 270b51b7610..abbf0e189d2 100644
--- a/.iyarc
+++ b/.iyarc
@@ -1,4 +1,3 @@
 # ReDoS vulnerability, no impact to this application, and fix not backported yet to the versions we use
 
 GHSA-c2qf-rxjj-qqgw
-GHSA-8hc4-vh64-cxmj
\ No newline at end of file
diff --git a/locales/languages/ru.json b/locales/languages/ru.json
index cdb76516f2e..abab186c955 100644
--- a/locales/languages/ru.json
+++ b/locales/languages/ru.json
@@ -724,10 +724,7 @@
     "enabling_profile_sync": "Включение синхронизации профиля...",
     "disabling_profile_sync": "Отключение синхронизации профиля...",
     "notifications_dismiss_modal": "Отклонить",
-<<<<<<< HEAD
-=======
     "select_rpc_url": "Select RPC URL",
->>>>>>> main
     "title": "Настройки",
     "current_conversion": "Базовая валюта",
     "current_language": "Текущий язык",
@@ -2026,11 +2023,7 @@
     "swap": "Выполнен обмен",
     "sent": "Отправленные на {{address}}",
     "menu_item_title": {
-<<<<<<< HEAD
-      "metamask_swap_completed": "{{symbol1}} обменяно на {{symbol2}}",
-=======
       "metamask_swap_completed": "Swapped {{symbolIn}} for {{symbolOut}}",
->>>>>>> main
       "erc20_sent": "Отправлено на {{address}}",
       "erc20_received": "Получено от {{address}}",
       "eth_sent": "Отправлено на {{address}}",
@@ -2057,11 +2050,7 @@
       "title_untake_ready": "Готово к выводу",
       "title_stake": "{{symbol}} в стейкинге",
       "title_unstake_completed": "Отмена стейкинга завершена",
-<<<<<<< HEAD
-      "title_swapped": "{{symbol1}} обменян в {{symbol2}}",
-=======
       "title_swapped": "Swapped {{symbolIn}} to {{symbolOut}}",
->>>>>>> main
       "label_address_to": "В",
       "label_address_from": "Из",
       "label_address_to_you": "В (вы)",
@@ -2796,13 +2785,10 @@
     "title_enabled_network": "This site wants to:",
     "title_new_network": "Добавлена новая сеть",
     "switch_warning": "В результате этого сеть, выбранная в MetaMask, будет изменена на ранее добавленную:",
-<<<<<<< HEAD
-=======
     "use_enabled_networks": "Use your enabled networks",
     "wants_to_see_your_accounts": "See your accounts and suggest transactions",
     "requesting_for": "Requesting for ",
     "edit": "Edit",
->>>>>>> main
     "add_network_and_give_dapp_permission_warning": "You're adding this network to MetaMask and giving {{dapp_origin}} permission to use it.",
     "available": "теперь доступно в селекторе сети.",
     "cancel": "Отмена",