From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop

---
 e2e/app.e2e-spec.ts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts
index cedad8f..1140f84 100644
--- a/e2e/app.e2e-spec.ts
+++ b/e2e/app.e2e-spec.ts
@@ -1,6 +1,6 @@
 import { AppPage } from './app.po';
 
-describe('screen-frontend App', () => {
+describe('ng-alain App', () => {
   let page: AppPage;
 
   beforeEach(() => {

--
Gitblit v1.8.0