diff options
| -rw-r--r-- | Essentials/src/messages_en.properties | 4 |
1 files changed, 0 insertions, 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 |