Merge branch 'master' into simplified-chinese-merge-fixes

2026-08-04 13:23:35 +08:00 · 2018-01-04 16:48:46 -05:00
parent bf1fbfe03f 1125351cd1
commit 4eaa234dd8
2 changed files with 2 additions and 4 deletions
@@ -52,11 +52,9 @@ function init() {
  ta.register('da', daTA);
  ta.register('fr', frTA);
  ta.register('pt_BR', pt_BRTA);
-<<<<<<< HEAD
  ta.register('zh_CN', zh_CNTA);
-=======
  ta.register('zh_TW', zh_TWTA);
->>>>>>> 1125351cd1e39fefd7160930896c4f7118a611c6
+
  timeagoInstance = ta();
 }