From 936bb39145eee86530f61d3345f8125ddd778225 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 16:35:07 +0800
Subject: [PATCH] 冲突修正
---
src/app/core/i18n/i18n.service.ts | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/app/core/i18n/i18n.service.ts b/src/app/core/i18n/i18n.service.ts
index b01d206..cf17dd2 100644
--- a/src/app/core/i18n/i18n.service.ts
+++ b/src/app/core/i18n/i18n.service.ts
@@ -10,6 +10,7 @@
private _default = 'zh-CN';
+ // ������������������ ��������� by fx
private _langs = [
{ code: 'zh-CN', text: '������' },
{ code: 'en', text: 'English' }
--
Gitblit v1.8.0