From 3941fe7c2b136945a0c2b571e3f5a153f7c151fd Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Fri, 18 Jun 2021 18:30:37 -0400
Subject: [PATCH] Fix incomplete merge

---
 share/applications/torbrowser-settings.desktop | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/share/applications/torbrowser-settings.desktop b/share/applications/torbrowser-settings.desktop
index fa07686..2305ec8 100644
--- 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
-- 
2.44.0