Merge branch 'develop' of https://github.com/BentoBoxWorld/Greenhouses.git into develop

2019-09-02 09:41:43 -07:00 · 2019-09-02 09:41:43 -07:00 · bfd6e29000
parent 2fc549949d 9da8d28122
commit bfd6e29000
1 changed files with 2 additions and 1 deletions
--- a/src/main/resources/locales/en-US.yml
+++ b/src/main/resources/locales/en-US.yml
@ -180,5 +180,6 @@ news:

 controlpanel:
   title: "&AGreenhouses"
-
+test:
+   test-line: "This is a test for git localize 2"