From 3f78e21ab274c60da4170ecd91ec6d6e93bf95c4 Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Fri, 27 Dec 2024 18:04:09 -0600 Subject: [PATCH] conflicts --- src/Ryujinx/Assets/locales.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json index 39eb512de..84cb18241 100644 --- a/src/Ryujinx/Assets/locales.json +++ b/src/Ryujinx/Assets/locales.json @@ -4165,11 +4165,7 @@ "no_NO": "6GB", "pl_PL": "", "pt_BR": "", -<<<<<<< HEAD - "ru_RU": "6 ГиБ", -======= "ru_RU": "6ГиБ", ->>>>>>> b5a9c73bb (ru_Ru locale update) "th_TH": "", "tr_TR": "", "uk_UA": "6Гб", @@ -4193,11 +4189,7 @@ "no_NO": "8GB", "pl_PL": "", "pt_BR": "", -<<<<<<< HEAD - "ru_RU": "8 ГиБ", -======= "ru_RU": "8ГиБ", ->>>>>>> b5a9c73bb (ru_Ru locale update) "th_TH": "", "tr_TR": "", "uk_UA": "8Гб", @@ -4221,11 +4213,7 @@ "no_NO": "12GB", "pl_PL": "", "pt_BR": "", -<<<<<<< HEAD - "ru_RU": "12 ГиБ", -======= "ru_RU": "12ГиБ", ->>>>>>> b5a9c73bb (ru_Ru locale update) "th_TH": "", "tr_TR": "", "uk_UA": "12Гб",