From 376902e802eafb94422a11987213a62e2d8e6cbf Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Tue, 13 Nov 2018 11:04:14 -0800
Subject: [PATCH] Don't fix merge conflicts on Github.
---
src/assets/translations.data.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/assets/translations.data.json b/src/assets/translations.data.json
index dc46c4667..643897d54 100644
--- a/src/assets/translations.data.json
+++ b/src/assets/translations.data.json
@@ -113,7 +113,7 @@
"spoke.browse_all_versions": "Browse All Versions",
"spoke.close": "Close",
"spoke.beginner_tutorial_button": "Learn Spoke in 5 Minutes",
- "spoke.advanced_tutorial_button": "Advanced Spoke in 10 minutes"
+ "spoke.advanced_tutorial_button": "Advanced Spoke in 10 minutes",
"spoke.play_button": "Learn Spoke in 5 Minutes",
"commands.fly": "Toggle fly mode.",
"commands.bigger": "Increase your avatar's size.",
--
GitLab