From b7010795b1e5e6bc0cb357f0cb4d716afef91138 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 08:53:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/business/enum/types.enum.ts | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/app/business/enum/types.enum.ts b/src/app/business/enum/types.enum.ts
index b1a5157..7fdb678 100644
--- a/src/app/business/enum/types.enum.ts
+++ b/src/app/business/enum/types.enum.ts
@@ -1,7 +1,6 @@
export enum Types {
Date, Json
}
-
export enum AlarmStyle {
//���������������������������������
weixin='weixin',email='email',sms='sms',voice='voice'
--
Gitblit v1.8.0