From 5b49631adbd8991964c605c1c58772e978e3ec5e Mon Sep 17 00:00:00 2001
From: Dmitry Nefedov <nefedovds@ya.ru>
Date: Thu, 14 Dec 2023 01:04:36 +0300
Subject: [PATCH] Update translate.ru_RU.toml

---
 web/translation/translate.ru_RU.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index bce9666f..06dd7bdc 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -473,7 +473,6 @@
 "manualDirectDomains" = "Список прямых доменов"
 "manualIPv4Domains" = "Список доменов IPv4"
 "manualWARPDomains" = "Список доменов WARP"
->>>>>>> c501c29ceae66bdc25c8cbe7053da273fdb4cb43
 
 [pages.settings.security]
 "admin" = "Админ"