Fix incomplete merge

diff --git a/share/applications/torbrowser-settings.desktop b/share/applications/torbrowser-settings.desktop
index fa07686e3633cd49f41bfe01053ceef1598d0b8e..2305ec8bff167fd028dd2ce96bdefb73b2aad667 100644 (file)
--- a/share/applications/torbrowser-settings.desktop
+++ b/share/applications/torbrowser-settings.desktop
@@ -7,11 +7,8 @@ Name[hu]=Tor-böngésző indító beállításai
 Name[nl]=Tor Browser Launcher Instellingen
 Name[pt_BR]=Navegador Tor (Configurações do Lançador)
 Name[ru]=Tor Browser (настройки запуска)
-<<<<<<< HEAD
 Name[sv]=Inställningar för Tor Browser Launcher
-=======
 Name[be]=Налады запускальніка Tor Browser
->>>>>>> Belarusian localization is added.
 GenericName=Tor Browser Launcher Settings
 GenericName[hr]=Tor preglednik – postavke pokretanja
 GenericName[hu]=Tor-böngésző indító beállításai
@@ -24,11 +21,8 @@ Comment[hu]=Tor-böngésző indító beállításai
 Comment[nl]=Tor Browser Launcher Instellingen
 Comment[pt_BR]=Navegador Tor (Configurações do Lançador)
 Comment[ru]=Tor Browser (настройки запуска)
-<<<<<<< HEAD
 Comment[sv]=Inställningar för Tor Browser Launcher
-=======
 Comment[be]=Налады запускальніка Tor Browser
->>>>>>> Belarusian localization is added.
 Exec=torbrowser-launcher --settings
 Terminal=false
 Type=Application