From 953e44c4a4fd93cffff5cf7afbefacfccc0b0820 Mon Sep 17 00:00:00 2001 From: Ali Moghnieh Date: Wed, 13 Jul 2016 21:53:46 +0100 Subject: [PATCH] Remove the HEAD! --- Essentials/src/messages_pt.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index d43ada9db..1f007bbb5 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -626,8 +626,6 @@ itemsConverted=\u00A76A converter todos os itens para blocos. itemsNotConverted=\u00A74N\u00E3o tens itens que possam ser transformado em blocos. mailSentTo=\u00A7c{0}\u00A76 foi enviado para o seguinte email: mailMessage={0} -<<<<<<< HEAD - whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0} playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76. mailFormat=\u00a76[\u00a7r{0}\u00a76] \u00a7r{1}