From 27c18424f4c8568dc05761e15bbffa1b4a4da328 Mon Sep 17 00:00:00 2001
From: Peter <>
Date: Mon, 29 Apr 2019 18:10:01 +0400
Subject: [PATCH] Fix merge

---
 Telegram-iOS/en.lproj/Localizable.strings | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index ef7c1fedd9..03ad41e679 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -4231,11 +4231,7 @@ Unused sets are archived when you add more.";
 
 "ChatList.ArchiveAction" = "Archive";
 "ChatList.UnarchiveAction" = "Unarchive";
-<<<<<<< HEAD
 "ChatList.HideAction" = "Unpin";
-=======
-"ChatList.HideAction" = "Hide";
->>>>>>> e8f89f29928527555050923b6bdeaa73b78d02d0
 "ChatList.UnhideAction" = "Pin";
 
 "ChatList.UndoArchiveTitle" = "Chat archived";