From 8c54f370922b4d5f13741ee6b06ecc307e2b6e7f Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 24 Jan 2012 20:47:11 +0000 Subject: [PATCH] Fix messages file --- Essentials/src/messages_en.properties | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 389d9c955..551d97348 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -293,11 +293,7 @@ requestDenied=\u00a77Teleport request denied. requestDeniedFrom=\u00a77{0} denied your teleport request. requestSent=\u00a77Request sent to {0}\u00a77. requestTimedOut=\u00a7cTeleport request has timed out -<<<<<<< HEAD requiredBukkit= * ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org. -======= -requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org. ->>>>>>> refs/heads/master returnPlayerToJailError=Error occurred when trying to return player to jail. second=second seconds=seconds