From 1b42dceb4f91096501e502d83b011448720a1821 Mon Sep 17 00:00:00 2001
From: Imperadeiro98 <Imperadeiro98@users.noreply.github.com>
Date: Sat, 31 Jan 2015 22:02:26 +0000
Subject: [PATCH] Last merge fix

---
 app/locale/ja.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index fc2bdc200..6b33ed320 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -82,7 +82,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     choose_your_level: "レベル選択" # The rest of this section is the old play view at /play-old and isn't very important.
     adventurer_prefix: "別のレベルに移動することができます。レベルについて議論するにはこちら: "
     adventurer_forum: "冒険者の掲示板"
-#   adventurer_suffix: "." #is this a period? as in "。"
+#    adventurer_suffix: "." #is this a period? as in "。"
 #    campaign_old_beginner: "Old Beginner Campaign"
     campaign_old_beginner_description: "プログラミングの魔法を学びましょう"
     campaign_dev: "いろんな難しいレベル"